diff --git a/AUTHORS b/AUTHORS
index 3087600f5..88f33f1b9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,7 +34,7 @@ that are otherwise encumbered.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2021-2021 by D. Michael Jones - acetousk
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Jacopo Cappellato - jacopoc
@@ -75,7 +75,7 @@ litigation is filed.
 
 Signed by git commit adding my legal name and git username:
 
-Written in 2010-2020 by David E. Jones - jonesde
+Written in 2010-2022 by David E. Jones - jonesde
 Written in 2021-2021 by D. Michael Jones - acetousk
 Written in 2014-2015 by Solomon Bessire - sbessire
 Written in 2014-2015 by Jacopo Cappellato - jacopoc
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index a95aa126c..11de99592 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,9 +1,22 @@
 
 # Moqui Runtime Release Notes
 
-## Release 3.0.0 - Not Yet Released
+## Release 3.0.0 - 31 May 2022
 
-Moqui Runtime 2.1.2 is a patch level new feature and bug fix release, in parallel with the release of Moqui Framework.
+Moqui Runtime 3.0.0 is a major new feature and bug fix release with some changes that are not backward compatible,
+in parallel with the release of Moqui Framework.
+
+In this release there is a new render mode (qvt) and apps screen wrapper (/qapps) that is like vuet and /vapps but uses
+the Quasar project, a Vue JS component library based on Google Material Design. The new Vue JS component library in Moqui
+(in WebrootVue.qvt.js) takes a big step toward more client rendering and better use of Vue JS components and events, 
+making it far easier to extend with dynamic behavior (vs the vuet and html render modes). 
+
+There are various small improvements to the System and Tools apps, and some new screens like an interactive Groovy Shell
+screen and a Table Stats screen that shows the number of records in each entity's table.
+
+This is a brief summary of the changes since the last release, for a complete list see the commit log:
+
+https://github.com/moqui/moqui-runtime/compare/v2.1.3...v3.0.0
 
 ### Non Backward Compatible Changes
 
@@ -11,9 +24,17 @@ Moqui Runtime 2.1.2 is a patch level new feature and bug fix release, in paralle
     - moquiSessionToken: for security reasons, it opened a vector in a CSRF attack to acquire the session token at any time
     - api_key: there is no good use case, just use cases that are less secure and poorly thought through
 
-For a complete list of changes see:
+### New Features
 
-https://github.com/moqui/moqui-runtime/compare/v2.1.3...v3.0.0
+- MFA support for login and update password in screens and REST API with factors including authc code by email and SMS,
+  TOTP code (via authenticator app), backup codes; can set a flag on UserGroup to require second factor for all users in
+  the group, and if any user has any additional factor enable then a second factor will be required
+- Saved Find dialog (in form-list) improvements to show options for scheduled screen render, to send regular reports to
+  users by email (simple email with CSV or XSLT attachment)
+- Groovy Shell screen added to the Tools app (with special permission), an interactive Groovy Console for testing in
+  various environments and for fixing certain production issues
+- Update Swagger UI to 4.1.3 with JS/CSS files loaded from cdnjs instead of locally to avoid having files in the repos
+  making it easier to update over time, along with cleaning up an old mess and a few CVE and WS security issues
 
 ## Release 2.1.3 - 07 Dec 2019
 
diff --git a/base-component/tools/MoquiConf.xml b/base-component/tools/MoquiConf.xml
index 12aa715e5..e1dc584b2 100644
--- a/base-component/tools/MoquiConf.xml
+++ b/base-component/tools/MoquiConf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!-- No copyright or license for configuration file, details here are not considered a creative work. -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
     <screen-facade>
         <screen location="component://webroot/screen/webroot/apps.xml">
             <subscreens-item name="system" menu-title="System" menu-index="98" location="component://tools/screen/System.xml"/>
diff --git a/base-component/tools/component.xml b/base-component/tools/component.xml
index ce1567196..385570cbc 100644
--- a/base-component/tools/component.xml
+++ b/base-component/tools/component.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
         name="tools" version="${moqui_version}"/>
diff --git a/base-component/tools/screen/System.xml b/base-component/tools/screen/System.xml
index 0366c58b9..7b5a85fea 100644
--- a/base-component/tools/screen/System.xml
+++ b/base-component/tools/screen/System.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="System" menu-image="fa fa-cog" menu-image-type="icon">
     <subscreens default-item="dashboard"/>
     <widgets>
diff --git a/base-component/tools/screen/System/ArtifactHitBins.xml b/base-component/tools/screen/System/ArtifactHitBins.xml
index 43566773b..688822f06 100644
--- a/base-component/tools/screen/System/ArtifactHitBins.xml
+++ b/base-component/tools/screen/System/ArtifactHitBins.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Bins" default-menu-index="3">
 
     <transition name="ArtifactHitBinStats.csv">
diff --git a/base-component/tools/screen/System/ArtifactHitSummary.xml b/base-component/tools/screen/System/ArtifactHitSummary.xml
index 913120512..0dcc651dd 100644
--- a/base-component/tools/screen/System/ArtifactHitSummary.xml
+++ b/base-component/tools/screen/System/ArtifactHitSummary.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Summary" default-menu-index="2">
 
     <transition name="ArtifactHitSummaryStats.csv">
diff --git a/base-component/tools/screen/System/AuditLog.xml b/base-component/tools/screen/System/AuditLog.xml
index 45a7d9b7b..3e4971aca 100644
--- a/base-component/tools/screen/System/AuditLog.xml
+++ b/base-component/tools/screen/System/AuditLog.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Audit Log" default-menu-index="4">
 
     <widgets>
diff --git a/base-component/tools/screen/System/Cache.xml b/base-component/tools/screen/System/Cache.xml
index 24215ec28..a042ea836 100644
--- a/base-component/tools/screen/System/Cache.xml
+++ b/base-component/tools/screen/System/Cache.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Cache" default-menu-index="5">
     <subscreens default-item="CacheList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Cache/CacheElements.xml b/base-component/tools/screen/System/Cache/CacheElements.xml
index 6f71075c5..7e2124abf 100644
--- a/base-component/tools/screen/System/Cache/CacheElements.xml
+++ b/base-component/tools/screen/System/Cache/CacheElements.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="cacheName" required="true"/>
 
diff --git a/base-component/tools/screen/System/Cache/CacheList.xml b/base-component/tools/screen/System/Cache/CacheList.xml
index 2a4236435..ac1e22780 100644
--- a/base-component/tools/screen/System/Cache/CacheList.xml
+++ b/base-component/tools/screen/System/Cache/CacheList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <transition name="clearCache">
         <actions><script>ec.cache.getCache(cacheName).clear()</script></actions>
diff --git a/base-component/tools/screen/System/DataDocument.xml b/base-component/tools/screen/System/DataDocument.xml
index 3db795e6e..be3b3c384 100644
--- a/base-component/tools/screen/System/DataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data Document" default-menu-index="6">
     <subscreens default-item="Search"/>
     <widgets>
diff --git a/base-component/tools/screen/System/DataDocument/Edit.xml b/base-component/tools/screen/System/DataDocument/Edit.xml
index 07c476baf..6c5d9eb08 100644
--- a/base-component/tools/screen/System/DataDocument/Edit.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="6">
     <subscreens default-item="FindDataDocument"/>
     <widgets><subscreens-panel id="DataDocEditPanel" type="tab"/></widgets>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
index 00f2076dc..2670a8eff 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Fields" default-menu-index="2">
 
     <parameter name="dataDocumentId" required="true" from="dataDocumentId ?: dataDocumentId_0"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
index 7f608d2ef..79863dcc7 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/DataDocFields/FieldList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="dataDocumentId" required="true" from="dataDocumentId ?: dataDocumentId_0"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
index b62d79e40..5fc95266f 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/EditDataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data Document" default-menu-index="1">
 
     <parameter name="dataDocumentId" required="true"/>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
index 259a72bf4..f5fde4971 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/FindDataDocument.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="editDataDocument"><default-response url="../EditDataDocument"/></transition>
diff --git a/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml b/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
index ec0c5b120..374bb7618 100644
--- a/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/Edit/ViewDataDocument.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="View" default-menu-index="3">
 
     <parameter name="dataDocumentId" required="true"/>
diff --git a/base-component/tools/screen/System/DataDocument/Export.xml b/base-component/tools/screen/System/DataDocument/Export.xml
index b03c7d063..c75f4ca67 100644
--- a/base-component/tools/screen/System/DataDocument/Export.xml
+++ b/base-component/tools/screen/System/DataDocument/Export.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Export" default-menu-index="3">
 
     <transition name="DocumentExport.json" read-only="true">
diff --git a/base-component/tools/screen/System/DataDocument/Index.xml b/base-component/tools/screen/System/DataDocument/Index.xml
index 5aa56626f..b96219696 100644
--- a/base-component/tools/screen/System/DataDocument/Index.xml
+++ b/base-component/tools/screen/System/DataDocument/Index.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Index" default-menu-index="2">
 
     <transition name="indexFeedDocuments">
diff --git a/base-component/tools/screen/System/DataDocument/Search.xml b/base-component/tools/screen/System/DataDocument/Search.xml
index af1c45eef..f659436f5 100644
--- a/base-component/tools/screen/System/DataDocument/Search.xml
+++ b/base-component/tools/screen/System/DataDocument/Search.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Search" default-menu-index="1">
 
     <transition name="viewDocument"><default-response url="../ViewDocument"/></transition>
diff --git a/base-component/tools/screen/System/DataDocument/ViewDocument.xml b/base-component/tools/screen/System/DataDocument/ViewDocument.xml
index 0ec7971e9..cdd76c0c9 100644
--- a/base-component/tools/screen/System/DataDocument/ViewDocument.xml
+++ b/base-component/tools/screen/System/DataDocument/ViewDocument.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="_index" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync.xml b/base-component/tools/screen/System/EntitySync.xml
index c585a4879..d4b46e906 100644
--- a/base-component/tools/screen/System/EntitySync.xml
+++ b/base-component/tools/screen/System/EntitySync.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="7">
     <subscreens default-item="EntitySyncList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml b/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
index f05632006..e07a0ad1c 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="entitySyncId" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml b/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
index a028e3ae5..2f5c2c6bb 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncHistory.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="History" default-menu-index="2">
 
     <parameter name="entitySyncId" required="true"/>
diff --git a/base-component/tools/screen/System/EntitySync/EntitySyncList.xml b/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
index 44166c55c..bc1e64c02 100644
--- a/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
+++ b/base-component/tools/screen/System/EntitySync/EntitySyncList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="entitySyncDetail"><default-response url="../EntitySyncDetail"/></transition>
diff --git a/base-component/tools/screen/System/Instance.xml b/base-component/tools/screen/System/Instance.xml
index cb68a30b0..585193dbd 100644
--- a/base-component/tools/screen/System/Instance.xml
+++ b/base-component/tools/screen/System/Instance.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Instances" default-menu-index="15">
     <subscreens default-item="InstanceList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Instance/InstanceDetail.xml b/base-component/tools/screen/System/Instance/InstanceDetail.xml
index d29e569f0..dd9ca1232 100644
--- a/base-component/tools/screen/System/Instance/InstanceDetail.xml
+++ b/base-component/tools/screen/System/Instance/InstanceDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Instance Detail">
 
     <parameter name="appInstanceId" required="true"/>
diff --git a/base-component/tools/screen/System/Instance/InstanceList.xml b/base-component/tools/screen/System/Instance/InstanceList.xml
index 84fb1b19a..13a3f7f17 100644
--- a/base-component/tools/screen/System/Instance/InstanceList.xml
+++ b/base-component/tools/screen/System/Instance/InstanceList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Application Instances" default-menu-include="false">
 
     <transition name="instanceDetail"><default-response url="../InstanceDetail"/></transition>
diff --git a/base-component/tools/screen/System/Localization.xml b/base-component/tools/screen/System/Localization.xml
index 06c532475..01fc5e5ef 100644
--- a/base-component/tools/screen/System/Localization.xml
+++ b/base-component/tools/screen/System/Localization.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Localization" default-menu-index="8">
     <subscreens default-item="Messages"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Localization/EntityFields.xml b/base-component/tools/screen/System/Localization/EntityFields.xml
index 3595d3aaa..89b50d793 100644
--- a/base-component/tools/screen/System/Localization/EntityFields.xml
+++ b/base-component/tools/screen/System/Localization/EntityFields.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity Fields" default-menu-index="2">
 
     <transition name="createLocalizedEntityField">
diff --git a/base-component/tools/screen/System/Localization/Messages.xml b/base-component/tools/screen/System/Localization/Messages.xml
index 61a5cff1a..fb172d4e3 100644
--- a/base-component/tools/screen/System/Localization/Messages.xml
+++ b/base-component/tools/screen/System/Localization/Messages.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Messages" default-menu-index="1">
 
     <transition name="createLocalizedMessage">
diff --git a/base-component/tools/screen/System/LogViewer.xml b/base-component/tools/screen/System/LogViewer.xml
index 5a285956c..fbd0ba730 100644
--- a/base-component/tools/screen/System/LogViewer.xml
+++ b/base-component/tools/screen/System/LogViewer.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Log Viewer" default-menu-index="20">
 
     <transition name="userAccountDetail"><default-response url="//apps/system/Security/UserAccount/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Print.xml b/base-component/tools/screen/System/Print.xml
index 30a696d07..571ba9412 100644
--- a/base-component/tools/screen/System/Print.xml
+++ b/base-component/tools/screen/System/Print.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="9">
     <subscreens default-item="Printer"/>
     <widgets><subscreens-panel id="PrintPanel" type="popup"/></widgets>
diff --git a/base-component/tools/screen/System/Print/PrintJob.xml b/base-component/tools/screen/System/Print/PrintJob.xml
index 9dfec6ea6..b53a1f119 100644
--- a/base-component/tools/screen/System/Print/PrintJob.xml
+++ b/base-component/tools/screen/System/Print/PrintJob.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Print Jobs" default-menu-index="1">
     <subscreens default-item="PrintJobList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml b/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
index 838e019e3..5b1d480da 100644
--- a/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
+++ b/base-component/tools/screen/System/Print/PrintJob/PrintJobDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="printJobId" required="true"/>
diff --git a/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml b/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
index 46043af1a..ddc22d863 100644
--- a/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
+++ b/base-component/tools/screen/System/Print/PrintJob/PrintJobList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="printJobDetail"><default-response url="../PrintJobDetail"/></transition>
diff --git a/base-component/tools/screen/System/Print/Printer.xml b/base-component/tools/screen/System/Print/Printer.xml
index 734c49f95..a21d24352 100644
--- a/base-component/tools/screen/System/Print/Printer.xml
+++ b/base-component/tools/screen/System/Print/Printer.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Printers" default-menu-index="2">
     <subscreens default-item="PrinterList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Print/Printer/PrinterList.xml b/base-component/tools/screen/System/Print/Printer/PrinterList.xml
index b85e00d35..668f6f7ce 100644
--- a/base-component/tools/screen/System/Print/Printer/PrinterList.xml
+++ b/base-component/tools/screen/System/Print/Printer/PrinterList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="getServerPrinters"><service-call name="org.moqui.impl.PrintServices.get#ServerPrinters"/>
diff --git a/base-component/tools/screen/System/Resource.xml b/base-component/tools/screen/System/Resource.xml
index 445d1eb50..536fe532e 100644
--- a/base-component/tools/screen/System/Resource.xml
+++ b/base-component/tools/screen/System/Resource.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Resource Finder" default-menu-index="10">
     <subscreens default-item="ElFinder"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Resource/ElFinder.xml b/base-component/tools/screen/System/Resource/ElFinder.xml
index beda6d050..e522f2db2 100644
--- a/base-component/tools/screen/System/Resource/ElFinder.xml
+++ b/base-component/tools/screen/System/Resource/ElFinder.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="elFinder">
 
     <parameter name="resourceRoot"/>
diff --git a/base-component/tools/screen/System/Security.xml b/base-component/tools/screen/System/Security.xml
index bc412cd91..f9d6deec0 100644
--- a/base-component/tools/screen/System/Security.xml
+++ b/base-component/tools/screen/System/Security.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="12">
     <subscreens default-item="UserAccount"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/ActiveUsers.xml b/base-component/tools/screen/System/Security/ActiveUsers.xml
index 71dd3efac..893a6bdb5 100644
--- a/base-component/tools/screen/System/Security/ActiveUsers.xml
+++ b/base-component/tools/screen/System/Security/ActiveUsers.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Active Users" default-menu-index="5">
 
     <transition name="userAccountDetail"><default-response url="//system/Security/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup.xml b/base-component/tools/screen/System/Security/ArtifactGroup.xml
index 57ebea2f7..0cadc4bba 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Artifact Groups" default-menu-index="3">
     <subscreens default-item="ArtifactGroupList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
index 8f3300c4b..547afa377 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="artifactGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
index 3dab226ea..883f8cdb0 100644
--- a/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
+++ b/base-component/tools/screen/System/Security/ArtifactGroup/ArtifactGroupList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="artifactGroupDetail"><default-response url="../ArtifactGroupDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/UserAccount.xml b/base-component/tools/screen/System/Security/UserAccount.xml
index 71848eb8b..b741cff96 100644
--- a/base-component/tools/screen/System/Security/UserAccount.xml
+++ b/base-component/tools/screen/System/Security/UserAccount.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Users" default-menu-index="1">
     <subscreens default-item="UserAccountList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
index 244e72225..e9b11c63e 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="userId" required="true" from="userId ?: userId_0"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
index 2b1cad05f..8693e7b62 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyEmail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="userId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
index b41fb53ab..b1e8a4aea 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifySms.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="userId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
index 055010d36..9c225458b 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail/VerifyTotp.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" standalone="true">
 
     <parameter name="factorId"/>
diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
index a1295ff79..d8f2c8698 100644
--- a/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
+++ b/base-component/tools/screen/System/Security/UserAccount/UserAccountList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="userAccountDetail"><default-response url="../UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/Security/UserGroup.xml b/base-component/tools/screen/System/Security/UserGroup.xml
index 52512f793..1d7633e50 100644
--- a/base-component/tools/screen/System/Security/UserGroup.xml
+++ b/base-component/tools/screen/System/Security/UserGroup.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="User Groups" default-menu-index="2">
     <subscreens default-item="UserGroupList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml b/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
index 5a73e9c11..816e7b8f5 100644
--- a/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/GroupUsers.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="2">
 
     <parameter name="userGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
index bf39c1a09..edd6a141b 100644
--- a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1">
 
     <parameter name="userGroupId" required="true"/>
diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
index c93f587a4..be0ce6505 100644
--- a/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
+++ b/base-component/tools/screen/System/Security/UserGroup/UserGroupList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="userGroupDetail"><default-response url="../UserGroupDetail"/></transition>
diff --git a/base-component/tools/screen/System/ServiceJob.xml b/base-component/tools/screen/System/ServiceJob.xml
index 068245b98..5110e9c7f 100644
--- a/base-component/tools/screen/System/ServiceJob.xml
+++ b/base-component/tools/screen/System/ServiceJob.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Jobs" default-menu-index="12">
     <subscreens default-item="Jobs"/>
     <widgets>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns.xml b/base-component/tools/screen/System/ServiceJob/JobRuns.xml
index 84ef67090..a36feb0c6 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Runs" default-menu-index="2">
 
     <subscreens default-item="JobRunList"/>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
index 2c103c2c5..ea725ce20 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Run Detail" default-menu-index="1">
 
     <parameter name="jobRunId" required="true"/>
diff --git a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
index cd4115e0b..b56af9a18 100644
--- a/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
+++ b/base-component/tools/screen/System/ServiceJob/JobRuns/JobRunList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="jobRunDetail"><default-response url="../JobRunDetail"/></transition>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs.xml b/base-component/tools/screen/System/ServiceJob/Jobs.xml
index 78d1777b3..cc4ebd3f9 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Jobs" default-menu-index="1">
 
     <subscreens default-item="ServiceJobList"/>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
index 53a02ba7f..859b70770 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Job Detail" default-menu-index="1">
 
     <parameter name="jobName" required="true"/>
diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
index 2188d8f63..f21364293 100644
--- a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
+++ b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="serviceJobDetail"><default-response url="../ServiceJobDetail"/></transition>
diff --git a/base-component/tools/screen/System/SystemMessage.xml b/base-component/tools/screen/System/SystemMessage.xml
index 5b78d7360..48bcecbe6 100644
--- a/base-component/tools/screen/System/SystemMessage.xml
+++ b/base-component/tools/screen/System/SystemMessage.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Sys-Sys Messages" default-menu-index="13">
     <subscreens default-item="Message"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Message.xml b/base-component/tools/screen/System/SystemMessage/Message.xml
index 840f847ff..a539efe54 100644
--- a/base-component/tools/screen/System/SystemMessage/Message.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Messages">
     <subscreens default-item="SystemMessageList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
index ac3cc3ee2..dd7fc9c25 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
index cfedb552a..92f46dafc 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail/EditMessageText.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         standalone="true">
 
     <parameter name="systemMessageId" required="true"/>
diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
index 5d90bf7bf..4800c1567 100644
--- a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="isOutgoing"/>
diff --git a/base-component/tools/screen/System/SystemMessage/Remote.xml b/base-component/tools/screen/System/SystemMessage/Remote.xml
index d40b40f6a..fea4d34be 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Remotes">
     <subscreens default-item="MessageRemoteList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
index 3a082298b..cf070e9a4 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageRemoteId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
index b715c0f50..eba8397bd 100644
--- a/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Remote/MessageRemoteList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="remoteDetail"><default-response url="../MessageRemoteDetail"/></transition>
diff --git a/base-component/tools/screen/System/SystemMessage/Type.xml b/base-component/tools/screen/System/SystemMessage/Type.xml
index 319a007af..a391e61e1 100644
--- a/base-component/tools/screen/System/SystemMessage/Type.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Types">
     <subscreens default-item="MessageTypeList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
index dcc234016..4da03400e 100644
--- a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <parameter name="systemMessageTypeId" required="true"/>
 
diff --git a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
index c0068e431..2b432289a 100644
--- a/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
+++ b/base-component/tools/screen/System/SystemMessage/Type/MessageTypeList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <transition name="typeDetail"><default-response url="../MessageTypeDetail"/></transition>
diff --git a/base-component/tools/screen/System/ThreadList.xml b/base-component/tools/screen/System/ThreadList.xml
index 2a7456bec..f964589b2 100644
--- a/base-component/tools/screen/System/ThreadList.xml
+++ b/base-component/tools/screen/System/ThreadList.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="99" default-menu-title="Thread List">
 
     <transition name="interruptThread">
diff --git a/base-component/tools/screen/System/Visit.xml b/base-component/tools/screen/System/Visit.xml
index 8ef8f5373..aa8e77450 100644
--- a/base-component/tools/screen/System/Visit.xml
+++ b/base-component/tools/screen/System/Visit.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Visits" default-menu-index="14">
     <subscreens default-item="VisitList"/>
     <widgets>
diff --git a/base-component/tools/screen/System/Visit/VisitDetail.xml b/base-component/tools/screen/System/Visit/VisitDetail.xml
index ec14f9854..5bb4105fa 100644
--- a/base-component/tools/screen/System/Visit/VisitDetail.xml
+++ b/base-component/tools/screen/System/Visit/VisitDetail.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="visitId" required="true"/>
diff --git a/base-component/tools/screen/System/Visit/VisitList.xml b/base-component/tools/screen/System/Visit/VisitList.xml
index 10a2c89ef..3ca3409e8 100644
--- a/base-component/tools/screen/System/Visit/VisitList.xml
+++ b/base-component/tools/screen/System/Visit/VisitList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <transition name="visitDetail"><default-response url="../VisitDetail"/></transition>
     <transition name="userAccountDetail"><default-response url="//system/Security/UserAccountDetail"/></transition>
diff --git a/base-component/tools/screen/System/dashboard.xml b/base-component/tools/screen/System/dashboard.xml
index 7d00c51ca..f15e34f24 100644
--- a/base-component/tools/screen/System/dashboard.xml
+++ b/base-component/tools/screen/System/dashboard.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">
 
     <transition name="threadList"><default-response url="../ThreadList"/></transition>
diff --git a/base-component/tools/screen/Tools.xml b/base-component/tools/screen/Tools.xml
index fc685ae72..edad284e4 100644
--- a/base-component/tools/screen/Tools.xml
+++ b/base-component/tools/screen/Tools.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         include-child-content="true" menu-image="fa fa-wrench" menu-image-type="icon">
     <subscreens default-item="dashboard">
     </subscreens>
diff --git a/base-component/tools/screen/Tools/ArtifactStats.xml b/base-component/tools/screen/Tools/ArtifactStats.xml
index 719b68c55..3045afd89 100644
--- a/base-component/tools/screen/Tools/ArtifactStats.xml
+++ b/base-component/tools/screen/Tools/ArtifactStats.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="3">
 
     <transition name="serviceReference"><default-response url="//tools/ServiceReference"/></transition>
diff --git a/base-component/tools/screen/Tools/AutoScreen.xml b/base-component/tools/screen/Tools/AutoScreen.xml
index f8aef58eb..6619f0ccd 100644
--- a/base-component/tools/screen/Tools/AutoScreen.xml
+++ b/base-component/tools/screen/Tools/AutoScreen.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Auto Screen" default-menu-index="2">
     <subscreens default-item="MainEntityList"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
index bfdc2ffd2..9518cb3fe 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="3">
 
     <parameter name="aen" required="true"/>
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
index b078174dc..3aecebf2a 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Detail" default-menu-index="3">
 
     <parameter name="aen" required="true"/><!-- Auto Entity Name -->
@@ -34,7 +34,7 @@ along with this software (see the LICENSE.md file). If not, see
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
 
-            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode createTransNode = screenNode.append("transition", [name:"create"])
             createTransNode.append("service-call", [name:"create#${den}".toString()])
             createTransNode.append("default-response", [url:"."])
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
index 9a8424646..723805cef 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoEdit/AutoEditMaster.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Master" default-menu-index="3">
 
     <parameter name="aen" required="true"/><!-- Auto Entity Name -->
@@ -69,7 +69,7 @@ along with this software (see the LICENSE.md file). If not, see
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
 
-            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi":"http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation":"http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode updateTransNode = screenNode.append("transition", [name:"update"])
             updateTransNode.append("service-call", [name:"update#${aen}".toString()])
             updateTransNode.append("default-response", [url:"."])
diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml b/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
index 678116383..0d19667ae 100644
--- a/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Find" default-menu-index="2">
 
     <parameter name="aen" required="true"/>
@@ -32,7 +32,7 @@ along with this software (see the LICENSE.md file). If not, see
 
             StringBuilder xmlBuilder = new StringBuilder()
             xmlBuilder.append('<?xml version="1.0" encoding="UTF-8"?>\n')
-            MNode screenNode = new MNode("screen", ["xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation": "http://moqui.org/xsd/xml-screen-2.1.xsd"])
+            MNode screenNode = new MNode("screen", ["xmlns:xsi": "http://www.w3.org/2001/XMLSchema-instance", "xsi:noNamespaceSchemaLocation": "http://moqui.org/xsd/xml-screen-3.xsd"])
             MNode actionsNode = screenNode.append("actions", null)
             actionsNode.append("entity-find", ["entity-name":aen, list:"entityValueList"]).append("search-form-inputs", null)
             MNode widgetsNode = screenNode.append("widgets", null)
diff --git a/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml b/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
index 67648fa58..7fd440318 100644
--- a/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
+++ b/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Auto Screen Entity List" default-menu-index="1">
 
     <transition name="find"><default-response url="../AutoFind"/></transition>
diff --git a/base-component/tools/screen/Tools/DataView.xml b/base-component/tools/screen/Tools/DataView.xml
index 449895979..0d9e25d20 100644
--- a/base-component/tools/screen/Tools/DataView.xml
+++ b/base-component/tools/screen/Tools/DataView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View" default-menu-index="4">
     <subscreens default-item="FindDbView"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/DataView/EditDbView.xml b/base-component/tools/screen/Tools/DataView/EditDbView.xml
index eedb58dad..3a717f795 100644
--- a/base-component/tools/screen/Tools/DataView/EditDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/EditDbView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit Data View Entity" default-menu-index="1">
 
     <parameter name="dbViewEntityName" required="true" from="dbViewEntityName ?: dbViewEntityName_0"/>
diff --git a/base-component/tools/screen/Tools/DataView/FindDbView.xml b/base-component/tools/screen/Tools/DataView/FindDbView.xml
index 159787cb5..34fcb33ae 100644
--- a/base-component/tools/screen/Tools/DataView/FindDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/FindDbView.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View Entity List" default-menu-index="1">
 
     <transition name="edit"><default-response url="../EditDbView"/></transition>
diff --git a/base-component/tools/screen/Tools/DataView/ViewDbView.xml b/base-component/tools/screen/Tools/DataView/ViewDbView.xml
index cca3a6ea9..0f1790338 100644
--- a/base-component/tools/screen/Tools/DataView/ViewDbView.xml
+++ b/base-component/tools/screen/Tools/DataView/ViewDbView.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Data View Results" default-menu-index="1">
 
     <parameter name="dbViewEntityName" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity.xml b/base-component/tools/screen/Tools/Entity.xml
index 7d6ab22f9..43aeda602 100644
--- a/base-component/tools/screen/Tools/Entity.xml
+++ b/base-component/tools/screen/Tools/Entity.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity" default-menu-index="5">
     <subscreens default-item="DataEdit"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit.xml b/base-component/tools/screen/Tools/Entity/DataEdit.xml
index 8cf50cc8f..b02dc01d2 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entities">
     <subscreens default-item="EntityList"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
index 8eba0ca8d..4437ce01a 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Edit" default-menu-index="3">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
index 62a379290..d51b98144 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Find" default-menu-index="2">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
index 568c6050b..a74f2c65f 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Detail">
 
     <parameter name="selectedEntity" required="true"/>
diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
index 0927c8e07..8ad0cad8b 100644
--- a/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
+++ b/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Entity List" default-menu-index="1">
 
     <transition name="find"><default-response url="../EntityDataFind"/></transition>
diff --git a/base-component/tools/screen/Tools/Entity/DataExport.xml b/base-component/tools/screen/Tools/Entity/DataExport.xml
index e442a20d8..21e8eec83 100644
--- a/base-component/tools/screen/Tools/Entity/DataExport.xml
+++ b/base-component/tools/screen/Tools/Entity/DataExport.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Export">
 
     <transition name="EntityExport" begin-transaction="false" read-only="true">
diff --git a/base-component/tools/screen/Tools/Entity/DataImport.xml b/base-component/tools/screen/Tools/Entity/DataImport.xml
index 0c8e5a771..89d7792f1 100644
--- a/base-component/tools/screen/Tools/Entity/DataImport.xml
+++ b/base-component/tools/screen/Tools/Entity/DataImport.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Import">
 
     <transition name="load">
diff --git a/base-component/tools/screen/Tools/Entity/DataSnapshot.xml b/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
index 269fdbdd1..45740716c 100644
--- a/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
+++ b/base-component/tools/screen/Tools/Entity/DataSnapshot.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Snapshots">
 
     <transition name="exportSnapshot" begin-transaction="false">
diff --git a/base-component/tools/screen/Tools/Entity/QueryStats.xml b/base-component/tools/screen/Tools/Entity/QueryStats.xml
index 8317015de..1e2ce99e1 100644
--- a/base-component/tools/screen/Tools/Entity/QueryStats.xml
+++ b/base-component/tools/screen/Tools/Entity/QueryStats.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Query Stats">
 
     <transition name="clearQueryStats"><actions><script>ec.entity.clearQueryStats()</script></actions>
diff --git a/base-component/tools/screen/Tools/Entity/SpeedTest.xml b/base-component/tools/screen/Tools/Entity/SpeedTest.xml
index 561445fe7..6b116cedf 100644
--- a/base-component/tools/screen/Tools/Entity/SpeedTest.xml
+++ b/base-component/tools/screen/Tools/Entity/SpeedTest.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Speed Test" begin-transaction="true">
 
     <transition name="speedTest"><default-response url="."/></transition>
diff --git a/base-component/tools/screen/Tools/Entity/SqlRunner.xml b/base-component/tools/screen/Tools/Entity/SqlRunner.xml
index 454a600ca..5faa6589e 100644
--- a/base-component/tools/screen/Tools/Entity/SqlRunner.xml
+++ b/base-component/tools/screen/Tools/Entity/SqlRunner.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="SQL Runner" begin-transaction="false"><!-- NOTE: begin tx is false so table meta data changes, etc can be done -->
 
     <actions>
diff --git a/base-component/tools/screen/Tools/Entity/TableStats.xml b/base-component/tools/screen/Tools/Entity/TableStats.xml
index 02bb52bb2..df0b2edfa 100644
--- a/base-component/tools/screen/Tools/Entity/TableStats.xml
+++ b/base-component/tools/screen/Tools/Entity/TableStats.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Table Stats">
 
     <transition name="entityDetail"><default-response url="../DataEdit/EntityDetail"/></transition>
diff --git a/base-component/tools/screen/Tools/GroovyShell.xml b/base-component/tools/screen/Tools/GroovyShell.xml
index 915d9eb73..d2014febe 100644
--- a/base-component/tools/screen/Tools/GroovyShell.xml
+++ b/base-component/tools/screen/Tools/GroovyShell.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="3">
 
     <actions>
diff --git a/base-component/tools/screen/Tools/Service.xml b/base-component/tools/screen/Tools/Service.xml
index 5e8570fc9..ac908f634 100644
--- a/base-component/tools/screen/Tools/Service.xml
+++ b/base-component/tools/screen/Tools/Service.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service" default-menu-index="6">
     <subscreens default-item="ServiceReference"/>
     <widgets>
diff --git a/base-component/tools/screen/Tools/Service/ServiceDetail.xml b/base-component/tools/screen/Tools/Service/ServiceDetail.xml
index 3350a4de0..0e606f6c4 100644
--- a/base-component/tools/screen/Tools/Service/ServiceDetail.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceDetail.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <parameter name="serviceName" required="true"/>
diff --git a/base-component/tools/screen/Tools/Service/ServiceReference.xml b/base-component/tools/screen/Tools/Service/ServiceReference.xml
index 16482d0b3..f793c9aaf 100644
--- a/base-component/tools/screen/Tools/Service/ServiceReference.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceReference.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Reference" default-menu-index="1">
 
     <transition name="serviceDetail">
diff --git a/base-component/tools/screen/Tools/Service/ServiceRun.xml b/base-component/tools/screen/Tools/Service/ServiceRun.xml
index 07c4a37da..cc37b88da 100644
--- a/base-component/tools/screen/Tools/Service/ServiceRun.xml
+++ b/base-component/tools/screen/Tools/Service/ServiceRun.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-title="Service Run" default-menu-index="2">
 
     <parameter name="serviceName"/>
diff --git a/base-component/tools/screen/Tools/dashboard.xml b/base-component/tools/screen/Tools/dashboard.xml
index 19bc55a8d..d45b78de6 100644
--- a/base-component/tools/screen/Tools/dashboard.xml
+++ b/base-component/tools/screen/Tools/dashboard.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-index="1" menu-image="fa fa-dashboard" menu-image-type="icon">
 
     <transition name="reloadEcfi" begin-transaction="false">
diff --git a/base-component/tools/screen/toolstatic.xml b/base-component/tools/screen/toolstatic.xml
index 110ed138b..7aa7d78ef 100644
--- a/base-component/tools/screen/toolstatic.xml
+++ b/base-component/tools/screen/toolstatic.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="anonymous-view">
     <widgets>
         <subscreens-active/>
diff --git a/base-component/tools/service/moqui.rest.xml b/base-component/tools/service/moqui.rest.xml
index a19706226..26d523b0a 100644
--- a/base-component/tools/service/moqui.rest.xml
+++ b/base-component/tools/service/moqui.rest.xml
@@ -15,7 +15,7 @@ along with this software (see the LICENSE.md file). If not, see
 
 <!-- General Guideline Verbs: GET=find, POST=create/do, PUT=store (create or update), PATCH=update, DELETE=delete  -->
 
-<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-2.1.xsd"
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/rest-api-3.xsd"
         name="moqui" displayName="Moqui Tools REST API" version="${moqui_version}"
         description="Services for various system administration and other tools in Moqui Framework. See more information
             about Moqui Framework at [http://www.moqui.org/framework](http://www.moqui.org/framework/index.html)">
diff --git a/base-component/webroot/component.xml b/base-component/webroot/component.xml
index f0b3fc878..4edb8748a 100644
--- a/base-component/webroot/component.xml
+++ b/base-component/webroot/component.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd"
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
         name="webroot" version="${moqui_version}"/>
diff --git a/base-component/webroot/screen/webroot.xml b/base-component/webroot/screen/webroot.xml
index 5cdb89ef2..da315c825 100644
--- a/base-component/webroot/screen/webroot.xml
+++ b/base-component/webroot/screen/webroot.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <!-- NOTE: require-authentication=false is required to allow sub-screens to decide, and because the Login screen is below this. -->
     <always-actions>
diff --git a/base-component/webroot/screen/webroot/ChangePassword.xml b/base-component/webroot/screen/webroot/ChangePassword.xml
index 261f03ef4..c4ac86b39 100644
--- a/base-component/webroot/screen/webroot/ChangePassword.xml
+++ b/base-component/webroot/screen/webroot/ChangePassword.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="false">
 
     <transition name="changePassword">
diff --git a/base-component/webroot/screen/webroot/Login.xml b/base-component/webroot/screen/webroot/Login.xml
index 2fca1b377..dbbd11501 100644
--- a/base-component/webroot/screen/webroot/Login.xml
+++ b/base-component/webroot/screen/webroot/Login.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="false" history="false">
 
     <parameter name="initialTab"/>
diff --git a/base-component/webroot/screen/webroot/SecondFactor.xml b/base-component/webroot/screen/webroot/SecondFactor.xml
index 3f071222a..737fa4028 100644
--- a/base-component/webroot/screen/webroot/SecondFactor.xml
+++ b/base-component/webroot/screen/webroot/SecondFactor.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false" require-authentication="anonymous-all" history="false">
 
     <transition name="sendOtp">
diff --git a/base-component/webroot/screen/webroot/apps.xml b/base-component/webroot/screen/webroot/apps.xml
index f5e4c6156..56b49a4b0 100644
--- a/base-component/webroot/screen/webroot/apps.xml
+++ b/base-component/webroot/screen/webroot/apps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL" default-menu-title="Applications">
     <!-- NOTE: require-authentication=false is required to allow sub-screens to decide. -->
 
diff --git a/base-component/webroot/screen/webroot/apps/AppList.xml b/base-component/webroot/screen/webroot/apps/AppList.xml
index e3c3139a8..d1a3ab4f1 100644
--- a/base-component/webroot/screen/webroot/apps/AppList.xml
+++ b/base-component/webroot/screen/webroot/apps/AppList.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true" default-menu-include="false" default-menu-title="App List">
 
     <actions>
diff --git a/base-component/webroot/screen/webroot/apps/ScreenTree.xml b/base-component/webroot/screen/webroot/apps/ScreenTree.xml
index a757befbc..452810fb6 100644
--- a/base-component/webroot/screen/webroot/apps/ScreenTree.xml
+++ b/base-component/webroot/screen/webroot/apps/ScreenTree.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="true" default-menu-include="false" default-menu-title="Site Map">
 
     <parameter name="showAll"/>
diff --git a/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml b/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
index 3d7b2ec6b..a8c1a4661 100644
--- a/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
+++ b/base-component/webroot/screen/webroot/apps/ScreenTree/ScreenTreeNested.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" default-menu-include="false">
 
     <actions>
diff --git a/base-component/webroot/screen/webroot/echopath.xml b/base-component/webroot/screen/webroot/echopath.xml
index 3c3ed968a..a35b4cab7 100644
--- a/base-component/webroot/screen/webroot/echopath.xml
+++ b/base-component/webroot/screen/webroot/echopath.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL"
         track-artifact-hit="false" standalone="true" allow-extra-path="true" default-menu-include="false">
 
diff --git a/base-component/webroot/screen/webroot/error.xml b/base-component/webroot/screen/webroot/error.xml
index d5b8015a0..7faf43928 100644
--- a/base-component/webroot/screen/webroot/error.xml
+++ b/base-component/webroot/screen/webroot/error.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_ERROR" default-menu-include="false">
     <pre-actions><script><![CDATA[
         html_stylesheets.add('/libs/twitter-bootstrap/css/bootstrap.min.css')
diff --git a/base-component/webroot/screen/webroot/error/Forbidden.xml b/base-component/webroot/screen/webroot/error/Forbidden.xml
index e9e4d3142..a556ce60c 100644
--- a/base-component/webroot/screen/webroot/error/Forbidden.xml
+++ b/base-component/webroot/screen/webroot/error/Forbidden.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/InternalError.xml b/base-component/webroot/screen/webroot/error/InternalError.xml
index 64f90033c..95b1cb29c 100644
--- a/base-component/webroot/screen/webroot/error/InternalError.xml
+++ b/base-component/webroot/screen/webroot/error/InternalError.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/NotFound.xml b/base-component/webroot/screen/webroot/error/NotFound.xml
index 5a3503beb..c1e90e454 100644
--- a/base-component/webroot/screen/webroot/error/NotFound.xml
+++ b/base-component/webroot/screen/webroot/error/NotFound.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/TooMany.xml b/base-component/webroot/screen/webroot/error/TooMany.xml
index 1faf2dcc8..a88386d0c 100644
--- a/base-component/webroot/screen/webroot/error/TooMany.xml
+++ b/base-component/webroot/screen/webroot/error/TooMany.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/error/Unauthorized.xml b/base-component/webroot/screen/webroot/error/Unauthorized.xml
index 386d31aac..ecd7516a4 100644
--- a/base-component/webroot/screen/webroot/error/Unauthorized.xml
+++ b/base-component/webroot/screen/webroot/error/Unauthorized.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false">
     <widgets>
         <render-mode><text type="html"><![CDATA[
diff --git a/base-component/webroot/screen/webroot/qapps.xml b/base-component/webroot/screen/webroot/qapps.xml
index 70771a7ef..5ee1fb3b7 100644
--- a/base-component/webroot/screen/webroot/qapps.xml
+++ b/base-component/webroot/screen/webroot/qapps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL_QUASAR" default-menu-title="Applications" allow-extra-path="true">
     <!-- NOTE: require-authentication=false so no permission required but in pre-actions if no user logged in goes to login screen -->
 
diff --git a/base-component/webroot/screen/webroot/rest.xml b/base-component/webroot/screen/webroot/rest.xml
index ca607a0aa..e238a5aa0 100644
--- a/base-component/webroot/screen/webroot/rest.xml
+++ b/base-component/webroot/screen/webroot/rest.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" track-artifact-hit="false" default-menu-include="false">
     <!-- NOTE: require-authentication=false is required to allow transitions to decide. -->
 
diff --git a/base-component/webroot/screen/webroot/rpc.xml b/base-component/webroot/screen/webroot/rpc.xml
index aaacf5427..bbaee29e4 100644
--- a/base-component/webroot/screen/webroot/rpc.xml
+++ b/base-component/webroot/screen/webroot/rpc.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" track-artifact-hit="false" default-menu-include="false">
     <!-- NOTE: require-authentication=false is required to allow transitions to decide. -->
 
diff --git a/base-component/webroot/screen/webroot/vapps.xml b/base-component/webroot/screen/webroot/vapps.xml
index 4aeef3d6d..3a2524df9 100644
--- a/base-component/webroot/screen/webroot/vapps.xml
+++ b/base-component/webroot/screen/webroot/vapps.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         require-authentication="false" screen-theme-type-enum-id="STT_INTERNAL" default-menu-title="Applications" allow-extra-path="true">
     <!-- NOTE: require-authentication=false so no permission required but in pre-actions if no user logged in goes to login screen -->
 
diff --git a/base-component/webroot/service/webroot/LocaleServices.xml b/base-component/webroot/service/webroot/LocaleServices.xml
index 346c0d815..9cb3875f0 100644
--- a/base-component/webroot/service/webroot/LocaleServices.xml
+++ b/base-component/webroot/service/webroot/LocaleServices.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-2.1.xsd">
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/service-definition-3.xsd">
 
     <service verb="get" noun="ValidateLocaleScripts" authenticate="anonymous-view">
         <in-parameters><parameter name="locale" type="java.util.Locale" default="ec.user.locale"/></in-parameters>
diff --git a/base-component/webroot/template/screen/BasicTransitions.xml b/base-component/webroot/template/screen/BasicTransitions.xml
index e96ca0037..7c7186a7f 100644
--- a/base-component/webroot/template/screen/BasicTransitions.xml
+++ b/base-component/webroot/template/screen/BasicTransitions.xml
@@ -12,7 +12,7 @@ You should have received a copy of the CC0 Public Domain Dedication
 along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
-<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd"
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"
         default-menu-include="false">
 
     <!-- NOTE: this screen is not meant to be rendered, it is just a library of transitions and sections to include -->
diff --git a/base-component/webroot/template/screen/BasicWidgetTemplates.xml b/base-component/webroot/template/screen/BasicWidgetTemplates.xml
index e65f59755..b48e2d020 100644
--- a/base-component/webroot/template/screen/BasicWidgetTemplates.xml
+++ b/base-component/webroot/template/screen/BasicWidgetTemplates.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <widget-templates xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-2.1.xsd">
+        xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd">
 
     <widget-template name="enumDropDown">
         <drop-down allow-empty="${allowEmpty ?: 'false'}" no-current-selected-key="${noCurrentSelectedKey?:''}"
diff --git a/conf/MoquiDevConf.xml b/conf/MoquiDevConf.xml
index 61cc09207..c74876868 100644
--- a/conf/MoquiDevConf.xml
+++ b/conf/MoquiDevConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <default-property name="instance_purpose" value="dev"/>
     <default-property name="webapp_allow_origins" value="*"/>
diff --git a/conf/MoquiLoadTestConf.xml b/conf/MoquiLoadTestConf.xml
index d731f1910..34c4504e4 100644
--- a/conf/MoquiLoadTestConf.xml
+++ b/conf/MoquiLoadTestConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <server-stats stats-skip-condition="pathInfo?.startsWith('/rpc') || pathInfo?.startsWith('/rest') || pathInfo?.startsWith('/status')"/>
 
diff --git a/conf/MoquiProductionConf.xml b/conf/MoquiProductionConf.xml
index b44ae98a8..2177fbb98 100644
--- a/conf/MoquiProductionConf.xml
+++ b/conf/MoquiProductionConf.xml
@@ -3,7 +3,7 @@
 
 <!-- NOTE: for default settings, examples, and comments see the MoquiDefaultConf.xml file at
     https://github.com/moqui/moqui-framework/blob/master/framework/src/main/resources/MoquiDefaultConf.xml -->
-<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-2.1.xsd">
+<moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <server-stats stats-skip-condition="pathInfo?.startsWith('/rpc') || pathInfo?.startsWith('/rest') || pathInfo?.startsWith('/status')"/>