diff --git a/MoquiConf.xml b/MoquiConf.xml
index b379a585..6b42dde6 100644
--- a/MoquiConf.xml
+++ b/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.xml">
             <subscreens-item name="store" menu-title="POP REST Store" menu-include="false"
diff --git a/component.xml b/component.xml
index 764a1293..affe4528 100644
--- a/component.xml
+++ b/component.xml
@@ -1,7 +1,6 @@
 <?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"
-        name="PopRestStore" version="1.0.1">
-    <depends-on name="moqui-fop" version="1.1.2"/>
-    <depends-on name="mantle-udm" version="2.1.2"/>
-    <depends-on name="mantle-usl" version="2.1.2"/>
+<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd"
+        name="PopRestStore" version="1.1.0">
+    <depends-on name="moqui-fop"/>
+    <depends-on name="mantle-usl" version="2.2.0"/>
 </component>
diff --git a/screen/store.xml b/screen/store.xml
index 64fb908b..c2d41f92 100644
--- a/screen/store.xml
+++ b/screen/store.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"
         standalone="true" require-authentication="anonymous-view" allow-extra-path="true">
 
     <always-actions>
diff --git a/screen/store/category.xml b/screen/store/category.xml
index 695a9e9d..852b838a 100755
--- a/screen/store/category.xml
+++ b/screen/store/category.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="anonymous-view" allow-extra-path="true">
     <parameter name="categoryId"/>
     <parameter name="orderBy"/>
@@ -104,4 +104,4 @@ along with this software (see the LICENSE.md file). If not, see
         <render-mode><text type="html" location="${template_server_category}"/></render-mode>
         <render-mode><text type="html" location="${template_server_footer}"/></render-mode>
     </widgets>
-</screen>
\ No newline at end of file
+</screen>
diff --git a/screen/store/content.xml b/screen/store/content.xml
index 9f195630..6c53f226 100755
--- a/screen/store/content.xml
+++ b/screen/store/content.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="anonymous-view" allow-extra-path="true">
 
     <transition name="attachment" read-only="true"><actions>
diff --git a/screen/store/d.xml b/screen/store/d.xml
index 87757615..7f576ffa 100644
--- a/screen/store/d.xml
+++ b/screen/store/d.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="anonymous-view" allow-extra-path="true">
 
     <subscreens always-use-full-path="true"/>
diff --git a/screen/store/home.xml b/screen/store/home.xml
index b841eab1..01ddf85c 100644
--- a/screen/store/home.xml
+++ b/screen/store/home.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="anonymous-view">
     <pre-actions>
          <set field="star" from="5"/>
diff --git a/screen/store/product.xml b/screen/store/product.xml
index 774f15e3..baef534d 100755
--- a/screen/store/product.xml
+++ b/screen/store/product.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="anonymous-view" allow-extra-path="true">
     <parameter name="productId"/>
     <parameter name="addedCorrect"/>
diff --git a/screen/store/search.xml b/screen/store/search.xml
index 19fc303d..43af8f7f 100644
--- a/screen/store/search.xml
+++ b/screen/store/search.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"   require-authentication="anonymous-view" allow-extra-path="true">
+<screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-3.xsd"   require-authentication="anonymous-view" allow-extra-path="true">
     <parameter name="searchParameter"/>
     <parameter name="pageIndex"/>
     <parameter name="addedCorrect"/>
diff --git a/service/pop.rest.xml b/service/pop.rest.xml
index 05e65665..5b5c436e 100644
--- a/service/pop.rest.xml
+++ b/service/pop.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="pop" displayName="POP REST Store API" version="1.0.0" description="Services for eCommerce">
 
     <!-- Store Services -->
diff --git a/service/popstore/CartServices.xml b/service/popstore/CartServices.xml
index e58db4b2..a42f82c5 100755
--- a/service/popstore/CartServices.xml
+++ b/service/popstore/CartServices.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">
 
 <!--
 General Order Placement and eCommerce Usage
diff --git a/service/popstore/CustomerServices.xml b/service/popstore/CustomerServices.xml
index 22d38e1c..e7fce23c 100755
--- a/service/popstore/CustomerServices.xml
+++ b/service/popstore/CustomerServices.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">
 
     <!-- Login and Register for eCommerce -->
 
diff --git a/service/popstore/ProductServices.xml b/service/popstore/ProductServices.xml
index e032b412..50b88a42 100755
--- a/service/popstore/ProductServices.xml
+++ b/service/popstore/ProductServices.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="ProductInfo">
         <in-parameters>
diff --git a/service/popstore/SearchServices.xml b/service/popstore/SearchServices.xml
index 970d3e4e..4848f90f 100644
--- a/service/popstore/SearchServices.xml
+++ b/service/popstore/SearchServices.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="search" noun="All">
         <in-parameters>
diff --git a/service/popstore/StoreServices.xml b/service/popstore/StoreServices.xml
index aefdd8ea..708920a4 100644
--- a/service/popstore/StoreServices.xml
+++ b/service/popstore/StoreServices.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="ProductStoreIdFromHostName">
         <in-parameters>