diff --git a/README.md b/README.md
index 04b43b3..12c9771 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# @oracle/ojet-cli 13.0.0
+# @oracle/ojet-cli 13.1.0
 
 ## About the module
 This module contains a command line interface for Oracle JET web and hybrid mobile application development.
@@ -64,7 +64,7 @@ Or view help on adding a plugin:
 ojet help add plugin
 ```
 
-For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1300&id=homepage).
+For more information on the Oracle JET CLI, refer to the [Oracle JET Developers Guide](http://www.oracle.com/pls/topic/lookup?ctx=jet1310&id=homepage).
 
 ## [Contributing](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md)
 Oracle JET is an open source project.  Pull Requests are currently not being accepted. See [CONTRIBUTING](https://github.com/oracle/ojet-cli/blob/master/CONTRIBUTING.md) for details.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 585e1a8..4607344 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,11 @@
 ## Release Notes for ojet-cli ##
 
+### 13.1.0
+
+* In index.html, the injected <script> type will be changed to 'module' for CDN bundle config loading if 'cdn' and 'bundles-config-esm.js' is selected in path_mapping.json, to support the new self-locating JET CDN bundle configuration file
+* Hybrid build/serve capability based on Cordova is deprecated as of 10.1.0 and is planned for removal in version 15.0.0
+
+
 ### 13.0.0
 
 * Metadata to support API documentation is now emitted for vcomponents during build
diff --git a/common/component.js b/common/component.js
index 7486de2..e8da969 100644
--- a/common/component.js
+++ b/common/component.js
@@ -223,7 +223,7 @@ function _replaceComponentTemplateToken(generator, pack) {
   const componentBasePath = _getComponentDestPath(generator);
   const folderPaths = [
     componentBasePath,
-    path.join(componentBasePath, 'resources/nls'),
+    path.join(componentBasePath, 'resources/nls/root'),
     path.join(componentBasePath, 'themes/base'),
     path.join(componentBasePath, 'themes/redwood'),
     path.join(componentBasePath, 'themes/stable')
@@ -327,7 +327,7 @@ function _renameComponentTemplatePrefix(generator) {
   const componentName = _getComponentName(generator);
   const folderPaths = [
     componentBasePath,
-    path.join(componentBasePath, 'resources/nls'),
+    path.join(componentBasePath, 'resources/nls/root'),
     path.join(componentBasePath, 'themes/base'),
     path.join(componentBasePath, 'themes/redwood'),
     path.join(componentBasePath, 'themes/stable')
diff --git a/generators/app/templates/common/package.json b/generators/app/templates/common/package.json
index a7590ec..4246c1e 100644
--- a/generators/app/templates/common/package.json
+++ b/generators/app/templates/common/package.json
@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "~13.0.0"
+    "@oracle/oraclejet": "~13.1.0"
   },
   "devDependencies": {
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/oraclejet-tooling": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"
diff --git a/generators/hybrid/templates/common/package.json b/generators/hybrid/templates/common/package.json
index 9daeb79..d96ce4b 100644
--- a/generators/hybrid/templates/common/package.json
+++ b/generators/hybrid/templates/common/package.json
@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit (JET) mobile app",
   "dependencies": {
-    "@oracle/oraclejet": "~13.0.0"
+    "@oracle/oraclejet": "~13.1.0"
   },
   "devDependencies": {
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "@oracle/oraclejet-tooling": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"
diff --git a/lib/util/utils.js b/lib/util/utils.js
index d6fac8c..20645ff 100644
--- a/lib/util/utils.js
+++ b/lib/util/utils.js
@@ -933,14 +933,12 @@ utils.getToolingPath = () => {
  */
 utils.getInstallerCommand = (options) => {
   const useCI = utils.hasProperty(options, 'ci');
-  if (useCI) {
-    return { installer: 'npm', verbs: { install: 'ci' } };
-  }
   let installerCmd = options.installer;
   if (!installerCmd) {
     const configPath = path.join(process.cwd(), constants.APP_CONFIG_JSON);
     const configJson = utils.readJsonAndReturnObject(configPath);
     installerCmd = configJson.installer || constants.DEFAULT_INSTALLER;
   }
-  return installerCmd === 'yarn' ? { installer: 'yarn', verbs: { install: 'install' } } : { installer: 'npm', verbs: { install: 'install' } };
+  const npmInstallCmd = useCI ? 'ci' : 'install';
+  return installerCmd === 'yarn' ? { installer: 'yarn', verbs: { install: 'install' } } : { installer: 'npm', verbs: { install: npmInstallCmd } };
 };
diff --git a/package.json b/package.json
index 2371604..02f6d0d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oracle/ojet-cli",
-  "version": "13.0.0",
+  "version": "13.1.0",
   "description": "Oracle JET Command Line Interface",
   "license": "UPL-1.0",
   "homepage": "http://www.oracle.com/jet",
@@ -15,8 +15,8 @@
     "inquirer": "~8.2.2",
     "minimist": "~1.2.0",
     "@xmldom/xmldom": "0.8.1",
-    "@oracle/oraclejet-tooling": "~13.0.0",
-    "@oracle/oraclejet-templates": "~13.0.0"
+    "@oracle/oraclejet-tooling": "~13.1.0",
+    "@oracle/oraclejet-templates": "~13.1.0"
   },
   "engines": {
     "node": ">=12.21.0"
diff --git a/template/component/js/component.json b/template/component/js/component.json
index e387a15..8d1fd87 100644
--- a/template/component/js/component.json
+++ b/template/component/js/component.json
@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^13.0.0",
+  "jetVersion": "^13.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {
diff --git a/template/component/js/resources/nls/@component@-strings.js b/template/component/js/resources/nls/root/@component@-strings.js
similarity index 60%
rename from template/component/js/resources/nls/@component@-strings.js
rename to template/component/js/resources/nls/root/@component@-strings.js
index e5bdfb2..c579035 100644
--- a/template/component/js/resources/nls/@component@-strings.js
+++ b/template/component/js/resources/nls/root/@component@-strings.js
@@ -5,9 +5,7 @@
 
 */
 define({
-  "root": {
-    "@component-name@" : {
-    		"sampleString": "The strings file can be used to manage translatable resources"
-    }
+  "@component-name@" : {
+    	"sampleString": "The strings file can be used to manage translatable resources"
   }
 });
\ No newline at end of file
diff --git a/template/component/ts/component.json b/template/component/ts/component.json
index e387a15..8d1fd87 100644
--- a/template/component/ts/component.json
+++ b/template/component/ts/component.json
@@ -1,7 +1,7 @@
 {
   "name": "@component-name@",
   "version": "1.0.0",
-  "jetVersion": "^13.0.0",
+  "jetVersion": "^13.1.0",
   "displayName": "A user friendly, translatable name of the component.",
   "description": "A translatable high-level description for the component.",
   "properties": {
diff --git a/template/component/ts/resources/nls/@component@-strings.ts b/template/component/ts/resources/nls/@component@-strings.ts
deleted file mode 100644
index 6a95704..0000000
--- a/template/component/ts/resources/nls/@component@-strings.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export = {
-  "root": {
-    "@component-name@" : {
-    		"sampleString": "The strings file can be used to manage translatable resources"
-    }
-  }
-};
\ No newline at end of file
diff --git a/template/component/ts/resources/nls/root/@component@-strings.ts b/template/component/ts/resources/nls/root/@component@-strings.ts
new file mode 100644
index 0000000..aaee07a
--- /dev/null
+++ b/template/component/ts/resources/nls/root/@component@-strings.ts
@@ -0,0 +1,5 @@
+export = {
+  "@component-name@": {
+    "sampleString": "The strings file can be used to manage translatable resources"
+  }
+};
\ No newline at end of file
diff --git a/template/component/tsx/resources/nls/@component@-strings.ts b/template/component/tsx/resources/nls/@component@-strings.ts
deleted file mode 100644
index 6a95704..0000000
--- a/template/component/tsx/resources/nls/@component@-strings.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export = {
-  "root": {
-    "@component-name@" : {
-    		"sampleString": "The strings file can be used to manage translatable resources"
-    }
-  }
-};
\ No newline at end of file
diff --git a/template/component/tsx/resources/nls/root/@component@-strings.ts b/template/component/tsx/resources/nls/root/@component@-strings.ts
new file mode 100644
index 0000000..aaee07a
--- /dev/null
+++ b/template/component/tsx/resources/nls/root/@component@-strings.ts
@@ -0,0 +1,5 @@
+export = {
+  "@component-name@": {
+    "sampleString": "The strings file can be used to manage translatable resources"
+  }
+};
\ No newline at end of file
diff --git a/template/resource-component/component.json b/template/resource-component/component.json
index ab055ae..2233f2c 100644
--- a/template/resource-component/component.json
+++ b/template/resource-component/component.json
@@ -2,7 +2,7 @@
     "name": "@component-name@",
     "type": "resource",
     "version": "1.0.0",
-    "jetVersion": "^13.0.0",
+    "jetVersion": "^13.1.0",
     "displayName": "A user friendly, translatable name of the component.",
     "description": "A translatable high-level description for the component.",
     "publicModules": [
diff --git a/test/buildConfig.json b/test/buildConfig.json
index 2a0a7c2..58d7e3e 100644
--- a/test/buildConfig.json
+++ b/test/buildConfig.json
@@ -1,17 +1,17 @@
-{
-  "ios": {
-      "debug": {
-        "provisioningProfile": "72a690e6-b96f-4a62-9f10-757cff093cc9",
-        "developmentTeam": "52QHD847TQ",
-        "codeSignIdentity": "iPhone Distribution",
-        "packageType": "enterprise"
-      },
-
-      "release": {
-        "provisioningProfile": "72a690e6-b96f-4a62-9f10-757cff093cc9",
-        "developmentTeam": "52QHD847TQ",
-        "codeSignIdentity": "iPhone Distribution",
-        "packageType": "enterprise"
-      }
-    }
+{
+  "ios": {
+      "debug": {
+        "provisioningProfile": "9ee22e98-ecd9-4d96-a49f-f2f0bb0ca2f0",
+        "developmentTeam": "52QHD847TQ",
+        "codeSignIdentity": "iPhone Distribution",
+        "packageType": "enterprise"
+      },
+  
+      "release": {
+        "provisioningProfile": "9ee22e98-ecd9-4d96-a49f-f2f0bb0ca2f0",
+        "developmentTeam": "52QHD847TQ",
+        "codeSignIdentity": "iPhone Distribution",
+        "packageType": "enterprise"
+      }
+    }
   }
\ No newline at end of file
diff --git a/test/componentTest.js b/test/componentTest.js
index 14871a8..95c8a3d 100644
--- a/test/componentTest.js
+++ b/test/componentTest.js
@@ -55,240 +55,13 @@ const COMPOSITE_COMPONENT_OPTIMIZED_FOLDER = 'min';
 
 const STRIP_TEST_PACK_NAME = 'pack-strip';
 const STRIP_TEST_COMPONENT_NAME = 'comp-strip';
-const STRIP_TEST_COMPONENT_JSON = {
-  "displayName": "A user friendly, translatable name of the component.",
-  "description": "A translatable high-level description for the component.",
-  "properties": {
-    "helpHints": {
-      "displayName": "Help Hints",
-      "description": "Represents hints for oj-form-layout element to render help information on the label of the component",
-      "type": "object",
-      "translatable": true,
-      "properties": {
-        "definition": {
-          "displayName": "Defintion",
-          "description": "Hint for help definition text associated with the label",
-          "type": "string"
-        },
-        "source": {
-          "displayName": "Source",
-          "description": "Hint for help source URL associated with the label.",
-          "type": "string"
-        }
-      }
-    },
-    "readOnly": {
-      "displayName": "Readonly",
-      "description": "Defines if the calendar as a whole can be edited in any way, can be overridden by individual events",
-      "type": "boolean",
-      "propertyGroup": "common",
-      "extension": {
-        "calendarOption": "editable",
-        "transform": "invert"
-      }
-    },
-    "displayOptions": {
-      "displayName": "Display Options",
-      "description": "Advanced options for configuring the calendar UI",
-      "type": "object",
-      "properties": {
-        "now": {
-          "displayName": "Current Date",
-          "description": "Date to use as the current date for the calendar, defaults to current date and time",
-          "type": "string",
-          "format": "date-time",
-          "propertyGroup": "data",
-          "extension": {
-            "catalog": {
-              "description": "I am to go!",
-              "check": {
-                "description": "Mamam"
-              }
-            },
-            "oracle": {
-              "businessApprovals": {
-                "description": "I am a software engineer at Oracle"
-              },
-              "type": "string"
-            },
-            "vbdt": {
-              "description": "I am to go!"
-            },
-            "audit": {
-              "thisData": {
-                "description": "Het",
-                "type": "string"
-              }
-            },
-            "calendarOption": "now"
-          }
-        },
-        "nowIndicator": {
-          "displayName": "Now Indicator",
-          "description": "Show a marker indicating the current date and time",
-          "type": "boolean",
-          "value": false,
-          "extension": {
-            "calendarOption": "nowIndicator"
-          }
-        },
-        "weekends": {
-          "displayName": "Show Weekends",
-          "description": "display weekends on the calendar",
-          "type": "boolean",
-          "value": true,
-          "extension": {
-            "calendarOption": "weekends"
-          }
-        },
-        "allowEventOverlap": {
-          "displayName": "Allow Overlap",
-          "description": "Controls if events are allowed to be edited to overlap in the schedule. Can be overridden on an event by event basis",
-          "type": "boolean",
-          "extension": {
-            "calendarOption": "eventOverlap"
-          }
-        },
-        "height": {
-          "displayName": "Height",
-          "description": "Allows an explicit height to be set for the whole calendar content area, use -1 to auto size the calendar to fill the dimensions of the element",
-          "type": "number",
-          "extension": {
-            "calendarOption": "height"
-          }
-        },
-        "locale": {
-          "displayName": "Locale",
-          "description": "Locale to show the calendar in, defaults to locale of page",
-          "type": "string",
-          "enumValues": ["af", "ar-dz", "ar-kw"],
-          "extension": {
-            "calendarOption": "locale"
-          }
-        }
-      }
-    }
-  },
-  "methods": {
-    "focus": {
-      "internalName": "setFocus",
-      "description": "A function to set focus on the field",
-      "return": "boolean"
-    }
-  },
-  "events": {
-    "onclick": {
-      "bubbles": true,
-      "description": "Demo",
-      "status": [{
-        "type": "deprecated"
-      }],
-      "cancelable": true
-    }
-  },
-  "slots": {
-    "check": {
-      "description": "Demo",
-      "visible": false,
-      "extension": {
-        "vbdt": {
-          "description": "demo"
-        }
-      }
-    }
-  },
-  "extension": {
-    "extension": {
-      "calendarOption": "locale"
-    },
-    "catalog": {
-      "description": "Demo test.",
-      "check": {
-        "description": "Demo test."
-      }
-    },
-    "oracle": {
-      "businessApprovals": {
-        "description": "Demo test."
-      }
-    },
-    "vbdt": {
-      "description": "Demo test."
-    },
-    "audit": {
-      "thisData": {
-        "description": "Demo test."
-      }
-    }
-  }
-};
-const EXPECTED_STRIPPED_JSON = {
-  "name": "comp-strip",
-  "version": "1.0.0",
-  "properties": {
-    "helpHints": {
-      "type": "object",
-      "properties": {
-        "definition": {
-          "type": "string"
-        },
-        "source": {
-          "type": "string"
-        }
-      }
-    },
-    "readOnly": {
-      "type": "boolean"
-    },
-    "displayOptions": {
-      "type": "object",
-      "properties": {
-        "now": {
-          "type": "string",
-          "extension": {
-            "oracle": {
-              "type": "string"
-            },
-            "audit": {
-              "thisData": {
-                "type": "string"
-              }
-            }
-          }
-        },
-        "nowIndicator": {
-          "type": "boolean",
-          "value": false
-        },
-        "weekends": {
-          "type": "boolean",
-          "value": true
-        },
-        "allowEventOverlap": {
-          "type": "boolean"
-        },
-        "height": {
-          "type": "number"
-        },
-        "locale": {
-          "type": "string",
-          "enumValues": ["af", "ar-dz", "ar-kw"]
-        }
-      }
-    }
-  },
-  "methods": {
-    "focus": {
-      "internalName": "setFocus"
-    }
-  }
-};
+const STRIP_TEST_COMPONENT_JSON = {"displayName":"A user friendly, translatable name of an unfriendly component.","description":"A translatable high-level description for a low-level component.","properties":{"helpHints":{"displayName":"Help Hints","description":"Represents hints for oj-form-layout element to render help information on the label for this helpless component.","type":"object","properties":{"sub-property":{"type":"string","placeholder":"Start at the very beginning...","enumValues":["doe","ray","mee"],"propertyEditorValues":{"doe":{"description":"A deer, a female deer...","displayName":"Doe","icon":{"hoverIconPath":"./path/to/hover","iconPath":"./path/to/icon","selectedIconPath":"./path/to/selection"}},"ray":{"description":"A drop of golden sun...","displayName":"Ray"},"mee":{"description":"Me, a name to call myself...","displayName":"Me"}},"value":"string","writeback":false,"units":"notes","binding":{"consume":{"name":"my-binding"},"provide":[{"name":"provider","default":"valueBind","transform":{"transform-prop":false}}]}}}},"source":{"displayName":"Source","description":"Hint for help source URL associated with the label.","type":"string","readOnly":true,"translatable":true,"dynamicSlotDef":"emptyDynamicSlot"},"readOnly":{"displayName":"Readonly","description":"Defines if the calendar as a whole can be edited in any way, can be overridden by individual events","type":"boolean|null","propertyGroup":"common","extension":{"calendarOption":"editable","transform":"invert"}},"fishes":{"type":"Array<object>","displayName":"Fishes","description":"Ordered list of fishes managed by this component","extension":{"vbdt":{"itemProperties":{"name":{"type":"string","description":"Name of the fish (e.g., 'Harold')"},"species":{"type":"object","displayName":"Species","description":"The fish's species information","properties":{"latin":{"type":"string","description":"Latin name of the species"},"english":{"type":"string","description":"Informal (english) name of the species"}}}}}}}},"methods":{"focus":{"internalName":"setFocus","description":"A function to set focus on the field","return":"boolean","help":"Go to this link...","visible":false,"params":[{"name":"value","description":"Value to set focus to","type":"string|null","status":[{"description":"Use a string value instead.","since":"1.1.0","target":"parameterType","value":["null"],"type":"deprecated"}]}],"status":[{"description":"Use standard HTML 'focus' method instead.","since":"2.0.0","type":"deprecated"}],"displayName":"setFocus method","extension":{"webelement":{"exceptionStatus":[{"type":"unsupported","since":"3.0.0","description":"Knock it off!"}]}}},"methodWithExtensionMD":{"description":"Dummy method with extension metadata that gets wiped","displayName":"Dummy Method","help":"dummy.html","extension":{"catalog":{"description":"I am to go!","check":{"description":"Mamam"}},"oracle":{"businessApprovals":{"description":"I am a software engineer at Oracle"}},"vbdt":{"description":"I am to go!"},"audit":{"thisData":{"description":"Het","type":"string"}},"calendarOption":"now"},"visible":true,"return":"string"},"foo":{}},"events":{"onclick":{"bubbles":true,"description":"Demo event","status":[{"description":"Go listen to something else","since":"3.0.0","type":"deprecated"}],"cancelable":true,"help":"click.html","displayName":"onClick Handler","visible":true,"detail":{"sourceID":{"type":"string|number","eventGroup":"common","description":"Who sent you?","extension":{"catalog":{"description":"I am to go!","check":{"description":"Mamam"}},"oracle":{"businessApprovals":{"description":"I am a software engineer at Oracle"}},"vbdt":{"description":"I am to go!"},"audit":{"thisData":{"description":"Het","type":"string"}},"calendarOption":"now"},"status":[{"description":"Expect sourceIDs to only be of type 'number' as of version 4.0.0","since":"2.0.0","target":"parameterType","value":["string"],"type":"deprecated"}]}}},"onTestShouldBeEmpty":{"description":"For testing","bubbles":false,"displayName":"empty on stripping","help":"./running_on_empty.html"},"onAnythingJustEmpty":{}},"slots":{"":{"description":"This is the default slot, y'all","displayName":"Default"},"deposits":{"description":"Where money is deposited","visible":true,"extension":{"vbdt":{"description":"demo"}},"displayName":"Deposit Slot","help":"depository.html","status":[{"description":"Does this look like a bank?!??!","since":"3.0.0","type":"deprecated"}],"data":{"bankInfo":{"description":"Bank information","type":"object","properties":{"name":{"type":"string","placeholder":"First National...","description":"Name of the bank","readOnly":true,"writeback":false,"extension":{"catalog":{"description":"I am to go!","check":{"description":"Mamam"}},"oracle":{"businessApprovals":{"description":"I am a software engineer at Oracle"}},"vbdt":{"description":"I am to go!"},"audit":{"thisData":{"description":"Het","type":"string"}},"calendarOption":"now"}},"amount":{"type":"number","description":"Amount"},"routing":{"type":"number|null","displayName":"Routing Number","description":"Bank routing number if a check, or null if cash"}}}},"preferredContent":["MoneyElement","CheckElement"],"maxItems":1000,"minItems":1},"shouldEndUpEmpty":{"visible":false,"displayName":"should be empty","description":"to test the code","maxItems":100,"minItems":0},"emptySlot":{}},"dynamicSlots":{"dynamic-slot":{"visible":true,"preferredContent":["PreferredContent"],"status":[{"description":"my status","since":"2.0.0","target":"parameterType","value":["string"],"type":"deprecated"}],"description":"slot for Dynamic Slot","displayName":"Dynamic Slot","help":"dy/no/mite.html","data":{"data-dynamic":{"description":"This is data for dyanamic slot","status":[{"description":"my status","since":"2.0.0","target":"parameterType","value":["string"],"type":"deprecated"}],"type":"string"}}},"emptyDynamicSlot":{}},"help":"comp1.html","since":"0.0.7","license":"MIT","styleVariables":[{"name":"comp-background","description":"Specify the component background","formats":["color"],"help":"stylish.html","displayName":"Variable","status":[{"description":"No background for you!","since":"2.2.0","type":"deprecated"}],"keywords":["auto","transparent"],"extension":{"catalog":{"description":"I am to go!","check":{"description":"Mamam"}},"oracle":{"businessApprovals":{"description":"I am a software engineer at Oracle"}},"vbdt":{"description":"I am to go!"},"audit":{"thisData":{"description":"Het","type":"string"}},"calendarOption":"now"}}],"status":[{"description":"This whole component was a mistake...","since":"3.0.0","type":"deprecated"}],"extension":{"catalog":{"audits":"../audit/rules.zip","category":"Other","tags":["worthless","garbage","trash"],"extraInfo":{}},"oracle":{"businessApprovals":{"vitaMeetaVegamin":"123456"},"uxSpecs":["figma-imagination"]},"themes":{"unsupportedThemes":["Stable"]},"vbdt":{"audits":"../audit/vbcs/rules.zip","defaultColumns":12,"minColumns":6}},"type":"composite"};
+const EXPECTED_STRIPPED_JSON = {"name":"comp-strip","version":"1.0.0","properties":{"helpHints":{"type":"object","properties":{"sub-property":{"type":"string","enumValues":["doe","ray","mee"],"value":"string","writeback":false,"binding":{"consume":{"name":"my-binding"},"provide":[{"name":"provider","default":"valueBind","transform":{"transform-prop":false}}]}}}},"source":{"type":"string","readOnly":true},"readOnly":{"type":"boolean|null","extension":{"calendarOption":"editable","transform":"invert"}},"fishes":{"type":"Array<object>"}},"methods":{"focus":{"internalName":"setFocus"},"methodWithExtensionMD":{"extension":{"audit":{"thisData":{"type":"string"}},"calendarOption":"now"}},"foo":{}},"events":{"onclick":{"detail":{"sourceID":{"type":"string|number","extension":{"audit":{"thisData":{"type":"string"}},"calendarOption":"now"}}}},"onTestShouldBeEmpty":{},"onAnythingJustEmpty":{}},"slots":{"":{},"deposits":{"data":{"bankInfo":{"type":"object","properties":{"name":{"type":"string","readOnly":true,"writeback":false,"extension":{"audit":{"thisData":{"type":"string"}},"calendarOption":"now"}},"amount":{"type":"number"},"routing":{"type":"number|null"}}}}},"shouldEndUpEmpty":{},"emptySlot":{}},"dynamicSlots":{"dynamic-slot":{"data":{"data-dynamic":{"type":"string"}}},"emptyDynamicSlot":{}}};
 // Returns the variables to used to run the test checks:
 function getStripTestVariables({
   pathToLocalComponentInWeb,
   pathToLocalComponentInSrc,
-  componentMinLoader,
-  appName
+  componentMinLoader
 }) {
   // Read and later on check that component.json in src and web are the same--meaning that the file is properly 
   // restored in web:
@@ -306,7 +79,6 @@ function getStripTestVariables({
   const regex = /component\.json",\s*\[\],\s*\(function\(\){return'(?<componentJSONInLoader>.*)'}\)\)/gm;
   const match = regex.exec(loaderJsContent);
   const modifiedComponentJSON = JSON.parse(match.groups.componentJSONInLoader.replace(/\\n/g, ''));
-  const modifiedComponentJSONAttributes = Object.getOwnPropertyNames(modifiedComponentJSON);
   let loaderHasStrippedAttributes;
   if (componentJSONInWeb.hasOwnProperty('pack')) {
     loaderHasStrippedAttributes = _.isEqual(modifiedComponentJSON, {
@@ -1089,6 +861,68 @@ describe('Component & Jet Pack Tests', () => {
       });
     }
 
+    function customComponentResourceBundleTest({
+      appName,
+      scriptsFolder,
+      component
+    }) {
+      if (!util.noScaffold()) {
+        beforeComponentTest({
+          task: 'create',
+          app: appName,
+          component
+        });
+      }
+      describe('check created component', () => {
+        it('should have the correct folder names under nls folder', () => {
+          const {
+            pathToSourceComponents,
+            pathToBuiltComponents
+          } = util.getAppPathData(appName, scriptsFolder);
+          const pathToNlsFolder = path.join(pathToSourceComponents, component, 'resources', 'nls');
+          const pathToRootFolder = path.join(pathToNlsFolder, 'root');
+          const pathToDeFolder = path.join(pathToNlsFolder, 'de');
+          const pathToFrFolder = path.join(pathToNlsFolder, 'fr');
+          // Copy the root folder's contents to the German and French folder for translation:
+          fs.copySync(pathToRootFolder, pathToDeFolder);
+          fs.copySync(pathToRootFolder, pathToFrFolder);
+          // Check that the path for the de and fr folders exist:
+          const deStringFileExists = fs.existsSync(path.join(pathToDeFolder, `${component}-strings.${scriptsFolder}`));
+          const frStringFileExists = fs.existsSync(path.join(pathToFrFolder, `${component}-strings.${scriptsFolder}`));
+          assert.ok(deStringFileExists, 'de directory not created successfully');
+          assert.ok(frStringFileExists, 'fr directory not created successfully');
+        })
+        it('should build successfully and have appropriate asserts in the resources folder', async() => {
+          const appDir = util.getAppDir(appName);
+          const {
+            pathToSourceComponents,
+            pathToBuiltComponents
+          } = util.getAppPathData(appName, scriptsFolder);
+          const result = await util.execCmd(`${util.OJET_APP_COMMAND} build --release`, { cwd: appDir }, true);
+          assert.equal(util.buildSuccess(result.stdout), true, result.error);
+          // Retrieve the nls, root, and string file paths:
+          const pathToNlsFolder = path.join(pathToBuiltComponents, component, '1.0.0', 'resources', 'nls');
+          const pathToRootFolder = path.join(pathToNlsFolder, 'root');
+          const pathToStringFile = path.join(pathToNlsFolder, `${component}-strings.js`);
+          // Ensure that the needed info exist in the appropriate files:
+          const stringFileContent = fs.readFileSync(pathToStringFile, {encoding: "utf-8"});
+          const hasRootAttribute = stringFileContent.includes(`"root":`);
+          const hasRootFolderinStaging = fs.existsSync(pathToRootFolder);
+          const hasDeAttribute = stringFileContent.includes(`"de": true`);
+          const hasFrAttribute = stringFileContent.includes(`"fr": true`);
+          // Delete the created component:
+          fs.removeSync(path.join(pathToSourceComponents, component));
+          const componentDeleted = !fs.existsSync(path.join(pathToSourceComponents, component));
+          // Check the tests:
+          assert.ok(hasRootAttribute, 'root attribute is not part of the string file');
+          assert.ok(hasDeAttribute, 'de language not referenced in string file');
+          assert.ok(hasFrAttribute, 'fr language not referenced in string file');
+          assert.ok(!hasRootFolderinStaging, 'has root folder in staging');
+          assert.ok(componentDeleted, `${component} is not deleted successfully`)
+        });
+      });
+    }
+
     describe('ojet create component', () => {
       function createComponentFailureTest({
         appName,
@@ -1237,6 +1071,12 @@ describe('Component & Jet Pack Tests', () => {
         component: STRIP_TEST_COMPONENT_NAME
       });
     });
+    describe('ojet build --release, custom component resource bundle test', () => {
+      util.runComponentTestInAllTestApps({
+        test: customComponentResourceBundleTest,
+        component: 'comp-res-bundle'
+      });
+    });
 
     // 
     // The remove component test is causing some errors in the pack tests.
@@ -1873,7 +1713,6 @@ describe('Component & Jet Pack Tests', () => {
           task: 'create',
           app: appName,
           pack,
-          componentJson: STRIP_TEST_COMPONENT_JSON,
           scriptsFolder
         });
         beforeComponentInPackTest({
diff --git a/test/ojcTest.js b/test/ojcTest.js
index eda46d7..827afe6 100644
--- a/test/ojcTest.js
+++ b/test/ojcTest.js
@@ -56,13 +56,15 @@ describe('Build with cdn', () => {
     // Change "use" to "cdn" in path_mapping.json
     const pathmappingJson = fs.readJsonSync(pathToPathMappingJson);
     pathmappingJson.use = 'cdn';
+    pathmappingJson.cdns.jet.config = 'bundles-config-esm-debug.js';
     // write it back out
     fs.writeJsonSync(pathToPathMappingJson, pathmappingJson);
   });
   after(() => {
-    // Revert "use" to "local" in path_mapping.json
+    // Revert "use" to "local" and regular bundles in path_mapping.json
     const pathmappingJson = fs.readJsonSync(pathToPathMappingJson);
     pathmappingJson.use = 'local';
+    pathmappingJson.cdns.jet.config = 'bundles-config.js';
     // write it back out
     fs.writeJsonSync(pathToPathMappingJson, pathmappingJson);
   });
@@ -73,6 +75,12 @@ describe('Build with cdn', () => {
       const pathString = '../../packs/oj-c';
       assert.ok(new RegExp(pathString).test(mainJs), 'main.js should contain a reference to packs/oj-c on the cdn ');
     });
+    it('should build index.html with a module type on the bundles script', () => {
+      const pathToIndexHTML = path.join(appDir, 'web', 'index.html');
+      const indexHTML = fs.readFileSync(pathToIndexHTML, { encoding: 'utf-8' });
+      const scriptString = "type='module'";
+      assert.ok(new RegExp(scriptString).test(indexHTML), `index.html should contain a type='module' reference`);
+    });
   }
   describe('debug build', () => {
     if (!util.noBuild()) {
diff --git a/test/templates/webTsApiTest/package.json b/test/templates/webTsApiTest/package.json
index 079981c..0b97bd0 100644
--- a/test/templates/webTsApiTest/package.json
+++ b/test/templates/webTsApiTest/package.json
@@ -3,14 +3,13 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "https://artifacthub-phx.oci.oraclecorp.com/ojet-dev-local/oracle-oraclejet-13.0.0.tgz"
+    "@oracle/oraclejet": "https://artifacthub-phx.oci.oraclecorp.com/ojet-dev-local/oracle-oraclejet-13.1.0.tgz"
   },
   "devDependencies": {
     "@oracle/oraclejet-tooling":"file:../../ojet-cli/node_modules/@oracle/oraclejet-tooling",
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
     "underscore": "^1.10.2",
-    "ts-creator": "~1.2.5",
     "yargs-parser": "~13.1.2",
     "typescript": "4.6.4"
   },
diff --git a/test/templates/webTsApiTest/src/css/demo-alta-site-min.css b/test/templates/webTsApiTest/src/css/demo-alta-site-min.css
index efd1461..490df2b 100644
--- a/test/templates/webTsApiTest/src/css/demo-alta-site-min.css
+++ b/test/templates/webTsApiTest/src/css/demo-alta-site-min.css
@@ -1 +1 @@
-@font-face{font-family:'AppFont';src:url("fonts/App_iconfont.woff") format("woff");font-weight:normal;font-style:normal}.demo-icon-font,.demo-icon-font-24{font-family:AppFont;font-size:16px;line-height:1;display:inline-block;font-weight:normal;speak:none;font-style:normal;font-variant:normal;text-transform:none;text-align:center;box-sizing:content-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.demo-icon-font:before,.demo-icon-font-24:before{display:inline-block}.demo-icon-font-24{font-size:24px}.demo-bookmark-icon-16:before{content:"\e606"}.demo-grid-icon-16:before{content:"\e607"}.demo-list-icon-16:before{content:"\e608"}.demo-gear-icon-16:before{content:"\e609"}.demo-filter-icon-16:before{content:"\e907"}.demo-share-icon-16:before{content:"\e90a"}.demo-home-icon-24:before{content:"\e600"}.demo-education-icon-24:before{content:"\e601"}.demo-catalog-icon-24:before{content:"\e602"}.demo-palette-icon-24:before{content:"\e603"}.demo-library-icon-24:before{content:"\e604"}.demo-chat-icon-24:before{content:"\e605"}.demo-edit-icon-24:before{content:"\e906"}.demo-fire-icon-24:before{content:"\e908"}.demo-person-icon-24:before{content:"\e909"}.demo-signout-icon-24:before{content:"\e90b"}.demo-info-icon-24:before{content:"\e900"}.demo-copy-icon-24:before{content:"\e901"}.demo-people-icon-24:before{content:"\e902"}.demo-chart-icon-24:before{content:"\e903"}.demo-garbage-icon-24:before{content:"\e904"}.demo-download-icon-24:before{content:"\e905"}.demo-oracle-icon{width:137px;height:18px}.demo-oracle-icon:before{content:url("images/oracle_logo.svg")}html:not([dir="rtl"]) .demo-oracle-icon{padding-right:4px}html[dir="rtl"] .demo-oracle-icon{padding-left:4px}.demo-oracle-icon:before{display:inline}.demo-appheader{background-color:#f0f0f0;box-shadow:0 3px 3px rgba(0,0,0,0.1);position:relative;margin-bottom:1px}.oj-slow-boxshadow .demo-appheader{border-bottom-color:#d9dfe3}.demo-appheader-appname{font-size:1.143rem;font-weight:normal;color:#4d4d4d}html:not([dir="rtl"]) .demo-appheader-toolbar-container{text-align:right}html[dir="rtl"] .demo-appheader-toolbar-container{text-align:left}.demo-appheader-toolbar-container .oj-toolbar{display:inline-block;margin-right:0;margin-left:0}.demo-appheader-logo-block{display:inline-block}.demo-appheader-offcanvas-pushwrapper{width:100%;overflow-x:hidden}.demo-appheader-appname-block{vertical-align:2px}html:not([dir="rtl"]) .demo-appheader-appname-block{margin-left:4px}html[dir="rtl"] .demo-appheader-appname-block{margin-right:4px}.demo-offcanvas-toggle{display:block}html:not([dir="rtl"]) .demo-offcanvas-toggle{float:left}html[dir="rtl"] .demo-offcanvas-toggle{float:right}.demo-appheader-classic .demo-appheader-nav{display:none}@media screen and (max-width: 767px){.demo-appheader{padding-left:2px;padding-right:2px}.demo-appheader-appname-block,.demo-appheader-pulldown-normal,.demo-appheader-toolbar-separator,.demo-appheader-toolbar-button{display:none}.demo-appheader-pulldown-small{display:inline-block}.demo-appheader-classic .demo-offcanvas-toggle{width:30%;position:relative}.demo-appheader-classic .demo-appheader-logo{text-align:center;float:none;width:40%;position:relative}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{margin-left:0}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{margin-right:0}}@media print, screen and (min-width: 768px){html:not([dir="rtl"]) .demo-offcanvas-toggle{margin-left:-10px}html[dir="rtl"] .demo-offcanvas-toggle{margin-right:-10px}.demo-appheader-appname-block,.demo-appheader-pulldown-normal{display:inline-block}.demo-appheader-pulldown-small{display:none}.demo-appheader{padding-left:10px;padding-right:10px}}@media print and (orientation: landscape), screen and (min-width: 1024px){.demo-offcanvas-toggle{display:none}.demo-appheader-appname-block{display:inline-block}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{margin-left:0}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{margin-right:0}.demo-appheader-classic .demo-appheader-nav{display:block}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-nav{text-align:right}html[dir="rtl"] .demo-appheader-classic .demo-appheader-nav{text-align:left}}.demo-appheader-lite .demo-appheader-logo{margin-top:9px}html:not([dir="rtl"]) .demo-appheader-lite .demo-appheader-logo{float:left}html[dir="rtl"] .demo-appheader-lite .demo-appheader-logo{float:right}.demo-appheader-lite .oj-toolbar{margin-top:0}.demo-appheader-classic .demo-appheader-logo{margin-top:8px}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{float:left;margin-left:4px}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{float:right;margin-right:4px}.demo-appheader-logo-oracle{padding-top:3px}.demo-appheader-logo-oracle{width:136px;height:19px}.demo-appheader-logo-oracle:before{content:url("images/oracle_logo_lrg.png")}@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx){.demo-appheader-logo-oracle:before{content:url("images/oracle_logo_lrg_2x.png");-webkit-transform:translate(-25%, -25%) scale(0.5);transform:translate(-25%, -25%) scale(0.5)}}.demo-appheader-avatar{width:24px;height:24px}.demo-appheader-avatar:before{content:url("images/avatar_24px.png")}@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx){.demo-appheader-avatar:before{content:url("images/avatar_24px_2x.png");-webkit-transform:translate(-25%, -25%) scale(0.5);transform:translate(-25%, -25%) scale(0.5)}}.demo-appheader-nav .oj-navigationlist-item-icon{color:#333}.demo-appheader-nav .oj-navigationlist-item-label{color:#4d4d4d}.oj-panel.demo-appheader-offcanvascontent{padding:0}.demo-appheader-offcanvascontent{color:#c0c4c8;background-color:#313334}.demo-appheader-toggle-button{margin-bottom:4px}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected{background-color:#202324}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover:not(.oj-selected){background-color:#262628;color:#fafafa}.demo-appheader-offcanvascontent a.oj-navigationlist-item-content{color:#c0c4c8}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover .oj-navigationlist-item-icon{color:#85bbe7}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover .oj-navigationlist-item-label{color:#85bbe7}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected .oj-navigationlist-item-label,.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected .oj-navigationlist-item-icon{color:#fafafa}.demo-appheader-nav .oj-navigationlist-item.oj-hover:not(.oj-selected){background-color:transparent;color:#85bbe7}.demo-appheader-nav .oj-navigationlist-item.oj-hover .oj-navigationlist-item-icon,.demo-appheader-nav .oj-navigationlist-item.oj-hover .oj-navigationlist-item-label{color:#85bbe7}.demo-appheader-nav .oj-navigationlist-item.oj-selected{background-color:transparent;color:#0572ce}.demo-appheader-nav .oj-navigationlist-item.oj-selected .oj-navigationlist-item-icon,.demo-appheader-nav .oj-navigationlist-item.oj-selected .oj-navigationlist-item-label{color:#0572ce}.demo-appcontent{margin-right:10px;margin-left:10px;margin-top:0.8571rem}.demo-appfooter{padding-left:10px;padding-right:10px;height:4.167em;border-top:1px solid #d9dfe3;background-color:#f0f0f0;box-sizing:border-box}.demo-appfooter-text{font-size:0.857rem;color:#4d4d4d}.demo-appfooter ul{margin-bottom:2px}html:not([dir="rtl"]) .demo-appfooter ul{padding-left:0px}html[dir="rtl"] .demo-appfooter ul{padding-right:0px}.demo-appfooter li{list-style:none;display:inline-block}html:not([dir="rtl"]) .demo-appfooter li{margin-right:5px;margin-left:0px;padding-right:5px;border-right:1px solid #d9dfe3}html[dir="rtl"] .demo-appfooter li{margin-left:5px;margin-right:0px;padding-left:5px;border-left:1px solid #d9dfe3}html:not([dir="rtl"]) .demo-appfooter li:last-child{border-right:none}html[dir="rtl"] .demo-appfooter li:last-child{border-left:none}.demo-flex-top-container{position:absolute;top:0;left:0;bottom:0;right:0}.demo-flex-container{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-flex:1 0 auto;flex:1 0 auto;position:relative;min-height:100%}.demo-flex-header{-webkit-flex:0 0 auto;flex:0 0 auto}.demo-flex-footer{-webkit-flex:0 0 auto;flex:0 0 auto}.demo-flex-content{-webkit-flex:1 0 auto;flex:1 0 auto}.demo-flex-center{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-flex:1 0 auto;flex:1 0 auto;box-sizing:border-box;position:relative;min-height:100vh}@media screen and (-webkit-min-device-pixel-ratio: 0){.demo-flex-center{min-height:100%}}html.demo-sticky-footer-layout,.demo-sticky-footer-layout body{height:100%}.demo-sticky-footer-layout{height:100%}.demo-sticky-footer-main-outer{min-height:100%}.demo-sticky-footer-main-inner{overflow:visible;padding-bottom:4.167em}.demo-sticky-footer-layout .demo-appfooter{position:relative;margin-top:-4.167em}@media print and (orientation: portrait), screen and (max-width: 1023px){.demo-wrap{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column}.demo-nav{padding-top:20px;-webkit-order:2;order:2}}.demo-header-toolbar-container{-webkit-align-items:center;align-items:center}html:not([dir="rtl"]) .demo-cook-search-button{float:right;margin-left:3px}html[dir="rtl"] .demo-cook-search-button{float:left;margin-right:3px}.demo-cook-search-input{overflow:hidden;display:block;width:auto}.demo-cook-search-input .oj-form-control{min-width:initial}#recipeTitle{margin-top:22px;margin-bottom:22px}#recipeTitle h1{display:inline-block}#componentContent{overflow:auto}#collapsibleRecipe{margin-top:25px}#componentRecipeContent>ul:first-child,#componentRecipeContent>ol:first-child{margin-top:0}#cookbookTitle h1{margin-top:4px;min-height:23px}#componentShell.oj-panel{padding:0}.demo-recipe-spacing{margin:20px 0;width:100%}.demo-recipe-table th,.demo-recipe-table td{border:1px solid lightgrey;border-collapse:collapse;width:10em;text-align:center;padding:10px}.demo-info-table th,.demo-info-table td{border:1px solid lightgrey;border-collapse:collapse;padding:10px}.demo-search-icon{font-size:1rem}.demo-help-icon{padding-left:5px}#doNotCopy{color:red;font-weight:bold;font-size:large;margin-left:100px}@font-face{font-family:'platforms';src:url("../images/formfactor/platform.woff") format("woff");font-weight:normal;font-style:normal}[class^="demo-platform-icon-"],[class*=" demo-platform-icon-"]{font-family:'platforms';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;width:24px;height:24px;font-size:24px}.demo-platform-icon-blocked:before{content:"\e905"}.demo-platform-icon-projector:before{content:"\e900"}.demo-platform-icon-wrench:before{content:"\e901"}.demo-platform-icon-leaf:before{content:"\e902"}.demo-platform-icon-cloud:before{content:"\e903"}.demo-platform-icon-hipster2:before{content:"\e904"}.demo-platform-icon-web:before{content:"\e9c9"}.demo-platform-icon-ios:before{content:"\eabf"}.demo-platform-icon-android:before{content:"\eac1"}.demo-platform-icon-windows:before{content:"\eac3"}.demo-platform-icon-desktop:before{content:"\e956"}.demo-platform-icon-phone-portrait:before,.demo-platform-icon-phone-landscape:before{content:"\e958"}.demo-platform-icon-phone-landscape:before{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.demo-platform-icon-tablet-portrait:before,.demo-platform-icon-tablet-landscape:before{content:"\e959"}.demo-platform-icon-tablet-landscape:before{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}#togglePinnedNavListButtonSet .oj-web-applayout-offcanvas-icon,#toggleNavListButton .oj-web-applayout-offcanvas-icon{height:24px;width:24px}#header .oj-default .demo-applayout-offcanvas-icon::before,#header .oj-focus-only .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header html[dir="rtl"] .oj-default .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-focus-only .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header .oj-hover .demo-applayout-offcanvas-icon::before,#header .oj-hover.oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ovr.svg")}#header html[dir="rtl"] .oj-hover .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-hover.oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ovr.svg")}#header .oj-active .demo-applayout-offcanvas-icon::before,#header .oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_sel.svg")}#header html[dir="rtl"] .oj-active .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_sel.svg")}#header .oj-disabled .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header html[dir="rtl"] .oj-disabled .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}.demo-applayout-offcanvas-icon{height:24px;width:24px}.demo-applayout-offcanvas-icon::before{display:inline-block}.demo-applayout-offcanvas-icon{font-family:"Alta Icon Font";line-height:1;display:inline-block;speak:none;font-style:normal;font-variant:normal;text-transform:none;text-align:center;box-sizing:content-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#togglePinnedNavListButtonSet .oj-button.oj-hover.oj-button-half-chrome{background-color:transparent;border-color:transparent}#togglePinnedNavListButtonSet .oj-button.oj-selected.oj-button-half-chrome{background-color:transparent;border-color:transparent}#toggleNavListButton.oj-button.oj-hover.oj-button-half-chrome{background-color:transparent;border-color:transparent}#toggleNavListButton.oj-button.oj-selected.oj-button-half-chrome{background-color:transparent;border-color:transparent}.demo-pinned-navlist .oj-web-applayout-content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column}.demo-pinned-navlist .demo-page-wrapper{-webkit-flex:auto;flex:auto;display:-webkit-flex;display:flex}.demo-pinned-navlist #navDrawer{position:relative}#page-container{-webkit-overflow-scrolling:touch}.markup-example:after,.script-example:after,.css-example:after{position:absolute;top:-1px;left:-1px;padding:3px 7px;font-size:12px;font-weight:bold;background-color:#f5f5f5;border:1px solid #ddd;color:#9da0a4;border-radius:4px 0 4px 0}.css-example:after{content:"CSS Editor"}.markup-example:after{content:"HTML Editor"}.script-example:after{content:"JS Editor"}.css-example,.markup-example,.script-example{clear:left;position:relative;padding:0 0 14px;background-color:#fff;border:1px solid #ddd;border-radius:4px}.script-example{padding-top:39px}#html-example,#script-example,#css-example{padding-top:1rem}.italic{font-style:italic}.bold{font-weight:bold}.underline{text-decoration:underline}.edit-button{float:right;position:absolute;right:20px;top:10px}.codeEditorInfo{top:10px;left:75px;float:right;position:absolute;font-size:13px;color:#4f4f4f;padding-top:5px}.demo-selectornames{font-size:12px;color:#9c5800;padding:2px 4px;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8;font-family:Consolas,Menlo,Monaco,"Source Code Pro","Courier New",Courier,monospace}#global-home-container{height:760px}.homeBox{position:absolute;box-sizing:border-box;display:inline-block;border:1px solid #d6dfe6;border-radius:3px;background-color:white;background-repeat:no-repeat;background-position:center top;cursor:pointer}.homeBox LABEL{position:absolute;width:100%;padding-left:10px;margin:0px;box-sizing:border-box;bottom:10px;color:#252525;font-weight:bold;font-size:16px}.homeBox .withCaret:after{content:" ";display:inline-block;vertical-align:middle;width:24px;height:24px;background-repeat:no-repeat;background-image:url("../../../images/caret.png")}#gettingStarted LABEL{font-size:24px;padding-left:0px;left:0;top:40px;bottom:auto;text-align:center}#gettingStarted.homeBox{left:20px;right:50%;top:20px;height:350px;margin-right:10px;background-position:center bottom;background-image:url("../../../images/iStock_000019915867_Medium.jpg")}#formControls.homeBox{left:50%;right:25%;top:20px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeTextAndSelection.png")}#buttons.homeBox{left:75%;right:20px;top:20px;height:165px;margin-left:5px;background-image:url("../../../images/homeButtons.png")}#dataCollections.homeBox{left:50%;right:25%;top:205px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeDataCollections.png")}#dataVisualizations.homeBox{left:75%;right:20px;top:205px;height:165px;margin-left:5px;background-image:url("../../../images/homeDataVisualizations.png")}#patterns.homeBox{left:20px;right:50%;top:390px;height:350px;margin-right:10px;background-image:url("../../../images/homePatterns.png")}#layout.homeBox{left:50%;right:20px;top:390px;height:165px;margin-left:10px;background-image:url("../../../images/homeLayoutAndNavigation.png")}#behaviorsAndAnimation.homeBox{left:50%;right:25%;top:575px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeBehaviorsAndAnimations.png")}#media.homeBox{left:75%;right:20px;top:575px;height:165px;margin-left:5px;background-image:url("../../../images/homeMedia.png")}@media only screen and (-webkit-min-device-pixel-ratio: 2){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");-webkit-background-size:24px 24px}#gettingStarted.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");-webkit-background-size:421px 443px}#formControls.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");-webkit-background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");-webkit-background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");-webkit-background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");-webkit-background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");-webkit-background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");-webkit-background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");-webkit-background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");-webkit-background-size:219px 116px}}@media only screen and (min-device-pixel-ratio: 2){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");background-size:24px 24px}#formControls.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");background-size:421px 443px}#textAndSelection.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");background-size:219px 116px}}@media only screen and (min-resolution: 2dppx){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");background-size:24px 24px}#gettingStarted.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");background-size:421px 443px}#formControls.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");background-size:219px 116px}}#documentsContainer{margin-top:25px}#documentsTabsContainer{margin-top:25px}#devGuideContentContainer{display:table;width:100%}#left_dev_guide_nav{overflow:hidden;width:250px;border-right:1px solid #d6dfe6;display:table-cell;padding-right:10px}#devGuideContent{display:table-cell;padding-left:10px}#examplesContentContainer,#oracleInternalContentContainer{position:relative}#examplesContent,#oracleInternalContent{margin-left:280px;min-height:300px}#left_examples_nav,#left_oracle_internal_nav{position:absolute;top:0;bottom:0;overflow:hidden;width:250px;margin-left:0;border-right:1px solid #d6dfe6;padding-right:10px}.oj-inline-icon{display:inline-block;vertical-align:top}#technologyStackInfoContainer{margin-top:30px;margin-bottom:30px}#technologyStackInfo{border:1px solid black}#technologyStackInfo tr td{border:1px solid black;padding:3px}.demo-sort-icon{height:16px;width:16px}.oj-default .demo-sort-icon:before,.oj-focus-only .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_ena.png")}.oj-hover .demo-sort-icon:before,.oj-hover.oj-selected .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_hov.png")}.oj-active .demo-sort-icon:before,.oj-selected .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_onb.png")}.oj-disabled .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_dis.png")}#componentListContainer{margin:-10px}#navItem{padding:10px 10px 0 0}.componentCategoryItemListview.oj-listview-card-layout{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:center;justify-content:center}.categorybanner{padding:36px 0 36px 6px;background-color:#0096E0;-webkit-transition:padding 0.4s ease-in-out;transition:padding 0.4s ease-in-out}.categorybanner.small{padding:3px 0px 3px 0px}.categorybanner.shrink{padding:3px 0px 3px 0px;position:fixed;z-index:1;left:0;right:0}.rootCollections_banner{background-color:#d97638}.rootControls_banner{background-color:#e55a37}.rootForms_banner{background-color:#ea5b6e}.rootFramework_banner{background-color:#d16ba6}.rootLayoutNav_banner{background-color:#2f9ad4}.rootPatterns_banner{background-color:#269e9e}.rootVisualizations_banner{background-color:#a5a2a2}.all_banner{background-color:#8d909b}.categorybanner h1{font-size:46px;color:#FFFFFF;padding:0;margin:0;line-height:40px;padding-left:20px;opacity:0.8;font-weight:lighter;font-family:"SF UI Display","Helvetica Neue","Roboto","Segoe UI",Arial,sans-serif;-webkit-transition:height 0.4s ease-in-out, width  0.4s ease-in-out,font-size 0.4s ease-in-out;transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out}.categorygrouplabel{font-size:26px;color:#FFFFFF;padding:0;margin:5px 0;line-height:40px;padding-left:20px;opacity:0.8;font-weight:lighter;font-family:"SF UI Display","Helvetica Neue","Roboto","Segoe UI",Arial,sans-serif}.categorybanner.small h1{font-size:26px}.categorybanner.shrink h1{font-size:26px;-webkit-transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out;transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out}.categorylist{list-style:none;width:100%;margin:20px}.categorylist.fixed{position:fixed;z-index:1;background-image:url("../../../libs/oj/13.0.0/alta/images/texture.png");background-repeat:repeat;margin:0;padding:20px}#filterMenuButtonBar.fixed{position:fixed;z-index:1;background-image:url("../../../libs/oj/13.0.0/alta/images/texture.png");background-repeat:repeat}.categoryitem{line-height:28px;cursor:default;padding-right:5px}.categoryitem a{width:100%;height:100%;padding:5px 15px;text-decoration:none;border-radius:15px;border:1px solid transparent}.categoryitem.categorySelected a,a.categorylink:hover{color:#ffffff}#rootCollections_category.categorySelected a,#rootCollections_category a:hover{background-color:#914f26}#rootControls_category.categorySelected a,#rootControls_category a:hover{background-color:#a64123}#rootForms_category.categorySelected a,#rootForms_category a:hover{background-color:#a6414c}#rootFramework_category.categorySelected a,#rootFramework_category a:hover{background-color:#8c4380}#rootLayoutNav_category.categorySelected a,#rootLayoutNav_category a:hover{background-color:#216a8a}#rootPatterns_category.categorySelected a,#rootPatterns_category a:hover{background-color:#186e6e}#rootVisualizations_category.categorySelected a,#rootVisualizations_category a:hover{background-color:#A5A2A2}#all_category.categorySelected a,#all_category a:hover{background-color:#5f6169}#componentListContainer .oj-listview{border-style:none;padding-right:5px}.componentCategoryItemListview .oj-listview-item{position:relative;background-image:none;margin-bottom:15px;padding:0}.componentCategoryItemListview .oj-listview-item img{display:block}.componentCategoryItemListview .oj-listview-item h4{font-size:16px;font-weight:normal}.componentCategoryItemListview .oj-listview-item.oj-hover,.componentCategoryItemListview .oj-listview-item.oj-hover+li.oj-listview-item{border-top-color:transparent}.componentInfo{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:10px;background-color:#fff;text-decoration:none}.componentShortDesc{color:#333;white-space:normal}.rootCollections_border{border-color:#d97638}.rootControls_border{border-color:#e55a37}.rootForms_border{border-color:#ea5b6e}.rootFramework_border{border-color:#d16ba6}.rootLayoutNav_border{border-color:#2f9ad4}.rootPatterns_border{border-color:#269e9e}.rootVisualizations_border{border-color:#a5a2a2}.all_border{border-color:#8d909b}.listingRef,.listingRef:hover,.listingRef:focus{text-decoration:none;cursor:default}.ribbon{position:absolute;right:-5px;top:-5px;z-index:1;overflow:hidden;width:75px;height:75px;text-align:right}.ribbon span{font-size:10px;color:#fff;text-transform:uppercase;text-align:center;font-weight:bold;line-height:20px;transform:rotate(45deg);width:100px;display:block;background-color:gray;box-shadow:0 3px 10px -5px #000;position:absolute;top:19px;right:-21px}.ribbon span::before{content:'';position:absolute;left:0px;top:100%;z-index:-1;border-left:3px solid gray;border-right:3px solid transparent;border-bottom:3px solid transparent;border-top:3px solid gray}.ribbon span::after{content:'';position:absolute;right:0%;top:100%;z-index:-1;border-right:3px solid gray;border-left:3px solid transparent;border-bottom:3px solid transparent;border-top:3px solid gray}[data-bind*="ojComponent"]:not(.oj-component-initnode){visibility:hidden}.global-container{position:relative}.boxSizing{box-sizing:border-box;position:relative}.pattern-nav{float:right}.demo-panel-contrast1{background-color:#313334;color:#fff}.demo-padding{background-image:none;margin:5px}
+@font-face{font-family:'AppFont';src:url("fonts/App_iconfont.woff") format("woff");font-weight:normal;font-style:normal}.demo-icon-font,.demo-icon-font-24{font-family:AppFont;font-size:16px;line-height:1;display:inline-block;font-weight:normal;speak:none;font-style:normal;font-variant:normal;text-transform:none;text-align:center;box-sizing:content-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.demo-icon-font:before,.demo-icon-font-24:before{display:inline-block}.demo-icon-font-24{font-size:24px}.demo-bookmark-icon-16:before{content:"\e606"}.demo-grid-icon-16:before{content:"\e607"}.demo-list-icon-16:before{content:"\e608"}.demo-gear-icon-16:before{content:"\e609"}.demo-filter-icon-16:before{content:"\e907"}.demo-share-icon-16:before{content:"\e90a"}.demo-home-icon-24:before{content:"\e600"}.demo-education-icon-24:before{content:"\e601"}.demo-catalog-icon-24:before{content:"\e602"}.demo-palette-icon-24:before{content:"\e603"}.demo-library-icon-24:before{content:"\e604"}.demo-chat-icon-24:before{content:"\e605"}.demo-edit-icon-24:before{content:"\e906"}.demo-fire-icon-24:before{content:"\e908"}.demo-person-icon-24:before{content:"\e909"}.demo-signout-icon-24:before{content:"\e90b"}.demo-info-icon-24:before{content:"\e900"}.demo-copy-icon-24:before{content:"\e901"}.demo-people-icon-24:before{content:"\e902"}.demo-chart-icon-24:before{content:"\e903"}.demo-garbage-icon-24:before{content:"\e904"}.demo-download-icon-24:before{content:"\e905"}.demo-oracle-icon{width:137px;height:18px}.demo-oracle-icon:before{content:url("images/oracle_logo.svg")}html:not([dir="rtl"]) .demo-oracle-icon{padding-right:4px}html[dir="rtl"] .demo-oracle-icon{padding-left:4px}.demo-oracle-icon:before{display:inline}.demo-appheader{background-color:#f0f0f0;box-shadow:0 3px 3px rgba(0,0,0,0.1);position:relative;margin-bottom:1px}.oj-slow-boxshadow .demo-appheader{border-bottom-color:#d9dfe3}.demo-appheader-appname{font-size:1.143rem;font-weight:normal;color:#4d4d4d}html:not([dir="rtl"]) .demo-appheader-toolbar-container{text-align:right}html[dir="rtl"] .demo-appheader-toolbar-container{text-align:left}.demo-appheader-toolbar-container .oj-toolbar{display:inline-block;margin-right:0;margin-left:0}.demo-appheader-logo-block{display:inline-block}.demo-appheader-offcanvas-pushwrapper{width:100%;overflow-x:hidden}.demo-appheader-appname-block{vertical-align:2px}html:not([dir="rtl"]) .demo-appheader-appname-block{margin-left:4px}html[dir="rtl"] .demo-appheader-appname-block{margin-right:4px}.demo-offcanvas-toggle{display:block}html:not([dir="rtl"]) .demo-offcanvas-toggle{float:left}html[dir="rtl"] .demo-offcanvas-toggle{float:right}.demo-appheader-classic .demo-appheader-nav{display:none}@media screen and (max-width: 767px){.demo-appheader{padding-left:2px;padding-right:2px}.demo-appheader-appname-block,.demo-appheader-pulldown-normal,.demo-appheader-toolbar-separator,.demo-appheader-toolbar-button{display:none}.demo-appheader-pulldown-small{display:inline-block}.demo-appheader-classic .demo-offcanvas-toggle{width:30%;position:relative}.demo-appheader-classic .demo-appheader-logo{text-align:center;float:none;width:40%;position:relative}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{margin-left:0}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{margin-right:0}}@media print, screen and (min-width: 768px){html:not([dir="rtl"]) .demo-offcanvas-toggle{margin-left:-10px}html[dir="rtl"] .demo-offcanvas-toggle{margin-right:-10px}.demo-appheader-appname-block,.demo-appheader-pulldown-normal{display:inline-block}.demo-appheader-pulldown-small{display:none}.demo-appheader{padding-left:10px;padding-right:10px}}@media print and (orientation: landscape), screen and (min-width: 1024px){.demo-offcanvas-toggle{display:none}.demo-appheader-appname-block{display:inline-block}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{margin-left:0}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{margin-right:0}.demo-appheader-classic .demo-appheader-nav{display:block}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-nav{text-align:right}html[dir="rtl"] .demo-appheader-classic .demo-appheader-nav{text-align:left}}.demo-appheader-lite .demo-appheader-logo{margin-top:9px}html:not([dir="rtl"]) .demo-appheader-lite .demo-appheader-logo{float:left}html[dir="rtl"] .demo-appheader-lite .demo-appheader-logo{float:right}.demo-appheader-lite .oj-toolbar{margin-top:0}.demo-appheader-classic .demo-appheader-logo{margin-top:8px}html:not([dir="rtl"]) .demo-appheader-classic .demo-appheader-logo{float:left;margin-left:4px}html[dir="rtl"] .demo-appheader-classic .demo-appheader-logo{float:right;margin-right:4px}.demo-appheader-logo-oracle{padding-top:3px}.demo-appheader-logo-oracle{width:136px;height:19px}.demo-appheader-logo-oracle:before{content:url("images/oracle_logo_lrg.png")}@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx){.demo-appheader-logo-oracle:before{content:url("images/oracle_logo_lrg_2x.png");-webkit-transform:translate(-25%, -25%) scale(0.5);transform:translate(-25%, -25%) scale(0.5)}}.demo-appheader-avatar{width:24px;height:24px}.demo-appheader-avatar:before{content:url("images/avatar_24px.png")}@media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi), (min-resolution: 1.5dppx){.demo-appheader-avatar:before{content:url("images/avatar_24px_2x.png");-webkit-transform:translate(-25%, -25%) scale(0.5);transform:translate(-25%, -25%) scale(0.5)}}.demo-appheader-nav .oj-navigationlist-item-icon{color:#333}.demo-appheader-nav .oj-navigationlist-item-label{color:#4d4d4d}.oj-panel.demo-appheader-offcanvascontent{padding:0}.demo-appheader-offcanvascontent{color:#c0c4c8;background-color:#313334}.demo-appheader-toggle-button{margin-bottom:4px}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected{background-color:#202324}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover:not(.oj-selected){background-color:#262628;color:#fafafa}.demo-appheader-offcanvascontent a.oj-navigationlist-item-content{color:#c0c4c8}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover .oj-navigationlist-item-icon{color:#85bbe7}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-hover .oj-navigationlist-item-label{color:#85bbe7}.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected .oj-navigationlist-item-label,.demo-appheader-offcanvascontent .oj-navigationlist-item.oj-selected .oj-navigationlist-item-icon{color:#fafafa}.demo-appheader-nav .oj-navigationlist-item.oj-hover:not(.oj-selected){background-color:transparent;color:#85bbe7}.demo-appheader-nav .oj-navigationlist-item.oj-hover .oj-navigationlist-item-icon,.demo-appheader-nav .oj-navigationlist-item.oj-hover .oj-navigationlist-item-label{color:#85bbe7}.demo-appheader-nav .oj-navigationlist-item.oj-selected{background-color:transparent;color:#0572ce}.demo-appheader-nav .oj-navigationlist-item.oj-selected .oj-navigationlist-item-icon,.demo-appheader-nav .oj-navigationlist-item.oj-selected .oj-navigationlist-item-label{color:#0572ce}.demo-appcontent{margin-right:10px;margin-left:10px;margin-top:0.8571rem}.demo-appfooter{padding-left:10px;padding-right:10px;height:4.167em;border-top:1px solid #d9dfe3;background-color:#f0f0f0;box-sizing:border-box}.demo-appfooter-text{font-size:0.857rem;color:#4d4d4d}.demo-appfooter ul{margin-bottom:2px}html:not([dir="rtl"]) .demo-appfooter ul{padding-left:0px}html[dir="rtl"] .demo-appfooter ul{padding-right:0px}.demo-appfooter li{list-style:none;display:inline-block}html:not([dir="rtl"]) .demo-appfooter li{margin-right:5px;margin-left:0px;padding-right:5px;border-right:1px solid #d9dfe3}html[dir="rtl"] .demo-appfooter li{margin-left:5px;margin-right:0px;padding-left:5px;border-left:1px solid #d9dfe3}html:not([dir="rtl"]) .demo-appfooter li:last-child{border-right:none}html[dir="rtl"] .demo-appfooter li:last-child{border-left:none}.demo-flex-top-container{position:absolute;top:0;left:0;bottom:0;right:0}.demo-flex-container{display:-webkit-flex;display:flex;-webkit-flex-direction:row;flex-direction:row;-webkit-flex:1 0 auto;flex:1 0 auto;position:relative;min-height:100%}.demo-flex-header{-webkit-flex:0 0 auto;flex:0 0 auto}.demo-flex-footer{-webkit-flex:0 0 auto;flex:0 0 auto}.demo-flex-content{-webkit-flex:1 0 auto;flex:1 0 auto}.demo-flex-center{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-flex:1 0 auto;flex:1 0 auto;box-sizing:border-box;position:relative;min-height:100vh}@media screen and (-webkit-min-device-pixel-ratio: 0){.demo-flex-center{min-height:100%}}html.demo-sticky-footer-layout,.demo-sticky-footer-layout body{height:100%}.demo-sticky-footer-layout{height:100%}.demo-sticky-footer-main-outer{min-height:100%}.demo-sticky-footer-main-inner{overflow:visible;padding-bottom:4.167em}.demo-sticky-footer-layout .demo-appfooter{position:relative;margin-top:-4.167em}@media print and (orientation: portrait), screen and (max-width: 1023px){.demo-wrap{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column}.demo-nav{padding-top:20px;-webkit-order:2;order:2}}.demo-header-toolbar-container{-webkit-align-items:center;align-items:center}html:not([dir="rtl"]) .demo-cook-search-button{float:right;margin-left:3px}html[dir="rtl"] .demo-cook-search-button{float:left;margin-right:3px}.demo-cook-search-input{overflow:hidden;display:block;width:auto}.demo-cook-search-input .oj-form-control{min-width:initial}#recipeTitle{margin-top:22px;margin-bottom:22px}#recipeTitle h1{display:inline-block}#componentContent{overflow:auto}#collapsibleRecipe{margin-top:25px}#componentRecipeContent>ul:first-child,#componentRecipeContent>ol:first-child{margin-top:0}#cookbookTitle h1{margin-top:4px;min-height:23px}#componentShell.oj-panel{padding:0}.demo-recipe-spacing{margin:20px 0;width:100%}.demo-recipe-table th,.demo-recipe-table td{border:1px solid lightgrey;border-collapse:collapse;width:10em;text-align:center;padding:10px}.demo-info-table th,.demo-info-table td{border:1px solid lightgrey;border-collapse:collapse;padding:10px}.demo-search-icon{font-size:1rem}.demo-help-icon{padding-left:5px}#doNotCopy{color:red;font-weight:bold;font-size:large;margin-left:100px}@font-face{font-family:'platforms';src:url("../images/formfactor/platform.woff") format("woff");font-weight:normal;font-style:normal}[class^="demo-platform-icon-"],[class*=" demo-platform-icon-"]{font-family:'platforms';speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;width:24px;height:24px;font-size:24px}.demo-platform-icon-blocked:before{content:"\e905"}.demo-platform-icon-projector:before{content:"\e900"}.demo-platform-icon-wrench:before{content:"\e901"}.demo-platform-icon-leaf:before{content:"\e902"}.demo-platform-icon-cloud:before{content:"\e903"}.demo-platform-icon-hipster2:before{content:"\e904"}.demo-platform-icon-web:before{content:"\e9c9"}.demo-platform-icon-ios:before{content:"\eabf"}.demo-platform-icon-android:before{content:"\eac1"}.demo-platform-icon-windows:before{content:"\eac3"}.demo-platform-icon-desktop:before{content:"\e956"}.demo-platform-icon-phone-portrait:before,.demo-platform-icon-phone-landscape:before{content:"\e958"}.demo-platform-icon-phone-landscape:before{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.demo-platform-icon-tablet-portrait:before,.demo-platform-icon-tablet-landscape:before{content:"\e959"}.demo-platform-icon-tablet-landscape:before{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}#togglePinnedNavListButtonSet .oj-web-applayout-offcanvas-icon,#toggleNavListButton .oj-web-applayout-offcanvas-icon{height:24px;width:24px}#header .oj-default .demo-applayout-offcanvas-icon::before,#header .oj-focus-only .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header html[dir="rtl"] .oj-default .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-focus-only .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header .oj-hover .demo-applayout-offcanvas-icon::before,#header .oj-hover.oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ovr.svg")}#header html[dir="rtl"] .oj-hover .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-hover.oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ovr.svg")}#header .oj-active .demo-applayout-offcanvas-icon::before,#header .oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_sel.svg")}#header html[dir="rtl"] .oj-active .demo-applayout-offcanvas-icon::before,#header html[dir="rtl"] .oj-selected .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_sel.svg")}#header .oj-disabled .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}#header html[dir="rtl"] .oj-disabled .demo-applayout-offcanvas-icon::before{content:url("../../../../images/24px_offcanvas_icon_ena.svg")}.demo-applayout-offcanvas-icon{height:24px;width:24px}.demo-applayout-offcanvas-icon::before{display:inline-block}.demo-applayout-offcanvas-icon{font-family:"Alta Icon Font";line-height:1;display:inline-block;speak:none;font-style:normal;font-variant:normal;text-transform:none;text-align:center;box-sizing:content-box;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#togglePinnedNavListButtonSet .oj-button.oj-hover.oj-button-half-chrome{background-color:transparent;border-color:transparent}#togglePinnedNavListButtonSet .oj-button.oj-selected.oj-button-half-chrome{background-color:transparent;border-color:transparent}#toggleNavListButton.oj-button.oj-hover.oj-button-half-chrome{background-color:transparent;border-color:transparent}#toggleNavListButton.oj-button.oj-selected.oj-button-half-chrome{background-color:transparent;border-color:transparent}.demo-pinned-navlist .oj-web-applayout-content{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column}.demo-pinned-navlist .demo-page-wrapper{-webkit-flex:auto;flex:auto;display:-webkit-flex;display:flex}.demo-pinned-navlist #navDrawer{position:relative}#page-container{-webkit-overflow-scrolling:touch}.markup-example:after,.script-example:after,.css-example:after{position:absolute;top:-1px;left:-1px;padding:3px 7px;font-size:12px;font-weight:bold;background-color:#f5f5f5;border:1px solid #ddd;color:#9da0a4;border-radius:4px 0 4px 0}.css-example:after{content:"CSS Editor"}.markup-example:after{content:"HTML Editor"}.script-example:after{content:"JS Editor"}.css-example,.markup-example,.script-example{clear:left;position:relative;padding:0 0 14px;background-color:#fff;border:1px solid #ddd;border-radius:4px}.script-example{padding-top:39px}#html-example,#script-example,#css-example{padding-top:1rem}.italic{font-style:italic}.bold{font-weight:bold}.underline{text-decoration:underline}.edit-button{float:right;position:absolute;right:20px;top:10px}.codeEditorInfo{top:10px;left:75px;float:right;position:absolute;font-size:13px;color:#4f4f4f;padding-top:5px}.demo-selectornames{font-size:12px;color:#9c5800;padding:2px 4px;white-space:nowrap;background-color:#f7f7f9;border:1px solid #e1e1e8;font-family:Consolas,Menlo,Monaco,"Source Code Pro","Courier New",Courier,monospace}#global-home-container{height:760px}.homeBox{position:absolute;box-sizing:border-box;display:inline-block;border:1px solid #d6dfe6;border-radius:3px;background-color:white;background-repeat:no-repeat;background-position:center top;cursor:pointer}.homeBox LABEL{position:absolute;width:100%;padding-left:10px;margin:0px;box-sizing:border-box;bottom:10px;color:#252525;font-weight:bold;font-size:16px}.homeBox .withCaret:after{content:" ";display:inline-block;vertical-align:middle;width:24px;height:24px;background-repeat:no-repeat;background-image:url("../../../images/caret.png")}#gettingStarted LABEL{font-size:24px;padding-left:0px;left:0;top:40px;bottom:auto;text-align:center}#gettingStarted.homeBox{left:20px;right:50%;top:20px;height:350px;margin-right:10px;background-position:center bottom;background-image:url("../../../images/iStock_000019915867_Medium.jpg")}#formControls.homeBox{left:50%;right:25%;top:20px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeTextAndSelection.png")}#buttons.homeBox{left:75%;right:20px;top:20px;height:165px;margin-left:5px;background-image:url("../../../images/homeButtons.png")}#dataCollections.homeBox{left:50%;right:25%;top:205px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeDataCollections.png")}#dataVisualizations.homeBox{left:75%;right:20px;top:205px;height:165px;margin-left:5px;background-image:url("../../../images/homeDataVisualizations.png")}#patterns.homeBox{left:20px;right:50%;top:390px;height:350px;margin-right:10px;background-image:url("../../../images/homePatterns.png")}#layout.homeBox{left:50%;right:20px;top:390px;height:165px;margin-left:10px;background-image:url("../../../images/homeLayoutAndNavigation.png")}#behaviorsAndAnimation.homeBox{left:50%;right:25%;top:575px;height:165px;margin-left:10px;margin-right:15px;background-image:url("../../../images/homeBehaviorsAndAnimations.png")}#media.homeBox{left:75%;right:20px;top:575px;height:165px;margin-left:5px;background-image:url("../../../images/homeMedia.png")}@media only screen and (-webkit-min-device-pixel-ratio: 2){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");-webkit-background-size:24px 24px}#gettingStarted.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");-webkit-background-size:421px 443px}#formControls.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");-webkit-background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");-webkit-background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");-webkit-background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");-webkit-background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");-webkit-background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");-webkit-background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");-webkit-background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");-webkit-background-size:219px 116px}}@media only screen and (min-device-pixel-ratio: 2){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");background-size:24px 24px}#formControls.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");background-size:421px 443px}#textAndSelection.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");background-size:219px 116px}}@media only screen and (min-resolution: 2dppx){.homeBox .withCaret:after{background-image:url("../../../images/caret@2x.png");background-size:24px 24px}#gettingStarted.homeBox{background-image:url("../../../images/iStock_000019915867_Medium@2x.jpg");background-size:421px 443px}#formControls.homeBox{background-image:url("../../../images/homeTextAndSelection@2x.png");background-size:219px 116px}#buttons.homeBox{background-image:url("../../../images/homeButtons@2x.png");background-size:219px 116px}#dataCollections.homeBox{background-image:url("../../../images/homeDataCollections@2x.png");background-size:219px 116px}#dataVisualizations.homeBox{background-image:url("../../../images/homeDataVisualizations@2x.png");background-size:219px 116px}#patterns.homeBox{background-image:url("../../../images/homePatterns@2x.png");background-size:458px 305px}#layout.homeBox{background-image:url("../../../images/homeLayoutAndNavigation@2x.png");background-size:458px 116px}#behaviorsAndAnimation.homeBox{background-image:url("../../../images/homeBehaviorsAndAnimations@2x.png");background-size:219px 116px}#media.homeBox{background-image:url("../../../images/homeMedia@2x.png");background-size:219px 116px}}#documentsContainer{margin-top:25px}#documentsTabsContainer{margin-top:25px}#devGuideContentContainer{display:table;width:100%}#left_dev_guide_nav{overflow:hidden;width:250px;border-right:1px solid #d6dfe6;display:table-cell;padding-right:10px}#devGuideContent{display:table-cell;padding-left:10px}#examplesContentContainer,#oracleInternalContentContainer{position:relative}#examplesContent,#oracleInternalContent{margin-left:280px;min-height:300px}#left_examples_nav,#left_oracle_internal_nav{position:absolute;top:0;bottom:0;overflow:hidden;width:250px;margin-left:0;border-right:1px solid #d6dfe6;padding-right:10px}.oj-inline-icon{display:inline-block;vertical-align:top}#technologyStackInfoContainer{margin-top:30px;margin-bottom:30px}#technologyStackInfo{border:1px solid black}#technologyStackInfo tr td{border:1px solid black;padding:3px}.demo-sort-icon{height:16px;width:16px}.oj-default .demo-sort-icon:before,.oj-focus-only .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_ena.png")}.oj-hover .demo-sort-icon:before,.oj-hover.oj-selected .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_hov.png")}.oj-active .demo-sort-icon:before,.oj-selected .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_onb.png")}.oj-disabled .demo-sort-icon:before{content:url("../../../../images/arrowupalphabetaz_16_dis.png")}#componentListContainer{margin:-10px}#navItem{padding:10px 10px 0 0}.componentCategoryItemListview.oj-listview-card-layout{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-webkit-justify-content:center;justify-content:center}.categorybanner{padding:36px 0 36px 6px;background-color:#0096E0;-webkit-transition:padding 0.4s ease-in-out;transition:padding 0.4s ease-in-out}.categorybanner.small{padding:3px 0px 3px 0px}.categorybanner.shrink{padding:3px 0px 3px 0px;position:fixed;z-index:1;left:0;right:0}.rootCollections_banner{background-color:#d97638}.rootControls_banner{background-color:#e55a37}.rootForms_banner{background-color:#ea5b6e}.rootFramework_banner{background-color:#d16ba6}.rootLayoutNav_banner{background-color:#2f9ad4}.rootPatterns_banner{background-color:#269e9e}.rootVisualizations_banner{background-color:#a5a2a2}.all_banner{background-color:#8d909b}.categorybanner h1{font-size:46px;color:#FFFFFF;padding:0;margin:0;line-height:40px;padding-left:20px;opacity:0.8;font-weight:lighter;font-family:"SF UI Display","Helvetica Neue","Roboto","Segoe UI",Arial,sans-serif;-webkit-transition:height 0.4s ease-in-out, width  0.4s ease-in-out,font-size 0.4s ease-in-out;transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out}.categorygrouplabel{font-size:26px;color:#FFFFFF;padding:0;margin:5px 0;line-height:40px;padding-left:20px;opacity:0.8;font-weight:lighter;font-family:"SF UI Display","Helvetica Neue","Roboto","Segoe UI",Arial,sans-serif}.categorybanner.small h1{font-size:26px}.categorybanner.shrink h1{font-size:26px;-webkit-transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out;transition:height 0.4s ease-in-out,width 0.4s ease-in-out,font-size 0.4s ease-in-out}.categorylist{list-style:none;width:100%;margin:20px}.categorylist.fixed{position:fixed;z-index:1;background-image:url("../../../libs/oj/13.1.0/alta/images/texture.png");background-repeat:repeat;margin:0;padding:20px}#filterMenuButtonBar.fixed{position:fixed;z-index:1;background-image:url("../../../libs/oj/13.1.0/alta/images/texture.png");background-repeat:repeat}.categoryitem{line-height:28px;cursor:default;padding-right:5px}.categoryitem a{width:100%;height:100%;padding:5px 15px;text-decoration:none;border-radius:15px;border:1px solid transparent}.categoryitem.categorySelected a,a.categorylink:hover{color:#ffffff}#rootCollections_category.categorySelected a,#rootCollections_category a:hover{background-color:#914f26}#rootControls_category.categorySelected a,#rootControls_category a:hover{background-color:#a64123}#rootForms_category.categorySelected a,#rootForms_category a:hover{background-color:#a6414c}#rootFramework_category.categorySelected a,#rootFramework_category a:hover{background-color:#8c4380}#rootLayoutNav_category.categorySelected a,#rootLayoutNav_category a:hover{background-color:#216a8a}#rootPatterns_category.categorySelected a,#rootPatterns_category a:hover{background-color:#186e6e}#rootVisualizations_category.categorySelected a,#rootVisualizations_category a:hover{background-color:#A5A2A2}#all_category.categorySelected a,#all_category a:hover{background-color:#5f6169}#componentListContainer .oj-listview{border-style:none;padding-right:5px}.componentCategoryItemListview .oj-listview-item{position:relative;background-image:none;margin-bottom:15px;padding:0}.componentCategoryItemListview .oj-listview-item img{display:block}.componentCategoryItemListview .oj-listview-item h4{font-size:16px;font-weight:normal}.componentCategoryItemListview .oj-listview-item.oj-hover,.componentCategoryItemListview .oj-listview-item.oj-hover+li.oj-listview-item{border-top-color:transparent}.componentInfo{margin:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;padding:10px;background-color:#fff;text-decoration:none}.componentShortDesc{color:#333;white-space:normal}.rootCollections_border{border-color:#d97638}.rootControls_border{border-color:#e55a37}.rootForms_border{border-color:#ea5b6e}.rootFramework_border{border-color:#d16ba6}.rootLayoutNav_border{border-color:#2f9ad4}.rootPatterns_border{border-color:#269e9e}.rootVisualizations_border{border-color:#a5a2a2}.all_border{border-color:#8d909b}.listingRef,.listingRef:hover,.listingRef:focus{text-decoration:none;cursor:default}.ribbon{position:absolute;right:-5px;top:-5px;z-index:1;overflow:hidden;width:75px;height:75px;text-align:right}.ribbon span{font-size:10px;color:#fff;text-transform:uppercase;text-align:center;font-weight:bold;line-height:20px;transform:rotate(45deg);width:100px;display:block;background-color:gray;box-shadow:0 3px 10px -5px #000;position:absolute;top:19px;right:-21px}.ribbon span::before{content:'';position:absolute;left:0px;top:100%;z-index:-1;border-left:3px solid gray;border-right:3px solid transparent;border-bottom:3px solid transparent;border-top:3px solid gray}.ribbon span::after{content:'';position:absolute;right:0%;top:100%;z-index:-1;border-right:3px solid gray;border-left:3px solid transparent;border-bottom:3px solid transparent;border-top:3px solid gray}[data-bind*="ojComponent"]:not(.oj-component-initnode){visibility:hidden}.global-container{position:relative}.boxSizing{box-sizing:border-box;position:relative}.pattern-nav{float:right}.demo-panel-contrast1{background-color:#313334;color:#fff}.demo-padding{background-image:none;margin:5px}
diff --git a/test/templates/webTsApiTest/src/index.html b/test/templates/webTsApiTest/src/index.html
index e378741..cdb7317 100644
--- a/test/templates/webTsApiTest/src/index.html
+++ b/test/templates/webTsApiTest/src/index.html
@@ -42,7 +42,7 @@
 
     <!-- This is the main css file for the default theme -->
     <!-- injector:theme -->
-    <link rel="stylesheet" href="css/libs/oj/13.0.0/redwood/oj-redwood-min.css" type="text/css"/>
+    <link rel="stylesheet" href="css/libs/oj/13.1.0/redwood/oj-redwood-min.css" type="text/css"/>
     <!-- endinjector -->
 
     <!-- This contains icon fonts used by the starter template -->
diff --git a/test/templates/webTsApiTest/src/js/main.js b/test/templates/webTsApiTest/src/js/main.js
index 528a6a1..b91a9c3 100644
--- a/test/templates/webTsApiTest/src/js/main.js
+++ b/test/templates/webTsApiTest/src/js/main.js
@@ -35,9 +35,9 @@
         'jqueryui-amd': 'libs/jquery/jqueryui-amd-1.13.0',
         'hammerjs': 'libs/hammer/hammer-2.0.8',
         'ojdnd': 'libs/dnd-polyfill/dnd-polyfill-1.0.2',
-        'ojs': 'libs/oj/13.0.0/debug',
-        'ojL10n': 'libs/oj/13.0.0/ojL10n',
-        'ojtranslations': 'libs/oj/13.0.0/resources',
+        'ojs': 'libs/oj/13.1.0/debug',
+        'ojL10n': 'libs/oj/13.1.0/ojL10n',
+        'ojtranslations': 'libs/oj/13.1.0/resources',
         'text': 'libs/require/text',
         'signals': 'libs/js-signals/signals',
         'customElements': 'libs/webcomponents/custom-elements.min',
diff --git a/test/templates/webTsApiTest/src/js/path_mapping.json b/test/templates/webTsApiTest/src/js/path_mapping.json
index 6412584..c4a988e 100644
--- a/test/templates/webTsApiTest/src/js/path_mapping.json
+++ b/test/templates/webTsApiTest/src/js/path_mapping.json
@@ -3,12 +3,12 @@
   "use": "local",
   "cdns": {
     "jet": {
-      "prefix": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/default/js",
-      "css": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/default/css",
-      "csspreact": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/3rdparty/oraclejet-preact/amd",
+      "prefix": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/default/js",
+      "css": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/default/css",
+      "csspreact": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/3rdparty/oraclejet-preact/amd",
       "config": "bundles-config.js"
     },
-    "3rdparty": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/3rdparty"
+    "3rdparty": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/3rdparty"
   },
   "libs": {
 
diff --git a/test/templates/webTsApiTest/src/ts/jet-composites/my-pack/resources/component.json b/test/templates/webTsApiTest/src/ts/jet-composites/my-pack/resources/component.json
index 88152a0..46030a6 100644
--- a/test/templates/webTsApiTest/src/ts/jet-composites/my-pack/resources/component.json
+++ b/test/templates/webTsApiTest/src/ts/jet-composites/my-pack/resources/component.json
@@ -1,7 +1,7 @@
 {
   "name": "resources",
   "version": "1.0.0",
-  "jetVersion": "^13.0.0",
+  "jetVersion": "^13.1.0",
   "type": "resource",
   "pack": "my-pack"
 }
diff --git a/test/templates/webpackLegacyTest/package.json b/test/templates/webpackLegacyTest/package.json
index b5907e9..7087704 100644
--- a/test/templates/webpackLegacyTest/package.json
+++ b/test/templates/webpackLegacyTest/package.json
@@ -3,13 +3,12 @@
   "version": "1.0.0",
   "description": "An Oracle JavaScript Extension Toolkit(JET) web app",
   "dependencies": {
-    "@oracle/oraclejet": "https://artifacthub-phx.oci.oraclecorp.com/ojet-dev-local/oracle-oraclejet-13.0.0.tgz"
+    "@oracle/oraclejet": "https://artifacthub-phx.oci.oraclecorp.com/ojet-dev-local/oracle-oraclejet-13.1.0.tgz"
   },
   "devDependencies": {
     "@oracle/oraclejet-tooling": "file:../../ojet-cli/node_modules/@oracle/oraclejet-tooling",
     "fs-extra": "^8.1.0",
     "glob": "7.2.0",
-    "ts-creator": "~1.2.5",
     "yargs-parser": "~13.1.2",
     "typescript": "4.6.4",
     "underscore": "^1.10.2",
diff --git a/test/templates/webpackLegacyTest/path_mapping.json b/test/templates/webpackLegacyTest/path_mapping.json
index 7077d99..b5618e2 100644
--- a/test/templates/webpackLegacyTest/path_mapping.json
+++ b/test/templates/webpackLegacyTest/path_mapping.json
@@ -2,12 +2,12 @@
   "use": "local",
   "cdns": {
     "jet": {
-      "prefix": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/default/js",
-      "css": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/default/css",
-      "csspreact": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/3rdparty/oraclejet-preact/amd",
+      "prefix": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/default/js",
+      "css": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/default/css",
+      "csspreact": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/3rdparty/oraclejet-preact/amd",
       "config": "bundles-config.js"
     },
-    "3rdparty": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.0.0/3rdparty"
+    "3rdparty": "https://ci-cloud.us.oracle.com/jenkins/uitech/job/CDN_master/lastSuccessfulBuild/artifact/cdn/13.1.0/3rdparty"
   },
   "libs": {
     "knockout": {
diff --git a/test/templates/webpackLegacyTest/src/main.js b/test/templates/webpackLegacyTest/src/main.js
index 16fac29..bc5fb93 100644
--- a/test/templates/webpackLegacyTest/src/main.js
+++ b/test/templates/webpackLegacyTest/src/main.js
@@ -31,9 +31,9 @@
       */
       // injector:mainReleasePaths
       {
-        'ojs': 'libs/oj/13.0.0/debug',
-        'ojL10n': 'libs/oj/13.0.0/ojL10n',
-        'ojtranslations': 'libs/oj/13.0.0/resources',
+        'ojs': 'libs/oj/13.1.0/debug',
+        'ojL10n': 'libs/oj/13.1.0/ojL10n',
+        'ojtranslations': 'libs/oj/13.1.0/resources',
           'knockout': 'libs/knockout/knockout-3.5.1.debug',
   'jquery': 'libs/jquery/jquery-3.6.0',
   'jqueryui-amd': 'libs/jquery/jqueryui-amd-1.13.0',
diff --git a/test/themeTest.js b/test/themeTest.js
index 340704a..f1ce539 100644
--- a/test/themeTest.js
+++ b/test/themeTest.js
@@ -88,6 +88,31 @@ describe('PCSS Theme Test', () => {
     assert.ok(hasRedwoodNotagMin, "The index.html file does not have a link to redwood-notag.min.css.");
   });
 
+  describe('svg optimization test', () => {
+    it('should fail to optimize an svg file and then emit its path as part of the error message', async () => {
+      const { pathToApp } = util.getAppPathData(util.THEME_APP_NAME);
+      const pathToRedwoodThemeImageFolder = path.join(pathToApp, 'staged-themes', 'redwood', 'web', 'images');
+      const pathToSvgTestFile = path.join(pathToRedwoodThemeImageFolder, 'test-file.svg');
+      const svgTestFileContent = 'This is not a valid svg content. Should cause optimization to fail.';
+      // Write the file invalid file content into the test-file:
+      fs.writeFileSync(pathToSvgTestFile, svgTestFileContent, {encoding: 'utf-8'});
+      // Run the build command and get the emitted build info:
+      const result = await util.execCmd(`${util.OJET_APP_COMMAND} build`, {cwd: appDir});
+      let errorMessageForCorruptedFile;
+      const pathToTestFileCreated = fs.existsSync(pathToSvgTestFile);
+      if (pathToTestFileCreated) {
+        errorMessageForFailingFile = `Error caused by file: ${pathToSvgTestFile}`;
+      }
+      // Delete the corrupted file; otherwise, subsequent tests will fail:
+      fs.removeSync(pathToSvgTestFile);
+      const pathToTestFileDeleted = fs.existsSync(pathToSvgTestFile);
+      const regex = new RegExp(errorMessageForCorruptedFile, 'g');
+      // Check the tests that they pass:
+      assert.ok(regex.test(result.stdout), result.stdout);
+      assert.equal(!pathToTestFileDeleted, true, 'Test file not deleted successfully.');
+    });
+  });
+
   describe ('Preact Theme Test', () => {
     it('Should have preact theme files in staging and the referred links in index.html on build with redwood theme', async () => {
       const { pathToIndexHtml } = util.getAppPathData(util.THEME_APP_NAME);
diff --git a/test/webpackTest.js b/test/webpackTest.js
index 1f00380..2b07c8d 100644
--- a/test/webpackTest.js
+++ b/test/webpackTest.js
@@ -44,8 +44,10 @@ describe('Webpack Test', () => {
             template: path.join(util.getTemplatesDir(), util.WEBPACK_LEGACY_APP_NAME)
           }
         };
+        console.log(`Start scaffolding ${util.WEBPACK_LEGACY_APP_NAME}`);
         await ojet.execute(executeOptions);
         assert.ok(true);
+        console.log(`Finish scaffolding ${util.WEBPACK_LEGACY_APP_NAME}`);
         // We need the locally built copy of oraclejet-tooling before the merge
         // to pick up the latest changes. Will remove after the merge
         util.copyOracleJetTooling(util.WEBPACK_LEGACY_APP_NAME);
@@ -70,8 +72,10 @@ describe('Webpack Test', () => {
             webpack: true
           }
         };
+        console.log(`Start scaffolding ${util.WEBPACK_APP_NAME}`);
         await ojet.execute(executeOptions);
         assert.ok(true);
+        console.log(`Finish scaffolding ${util.WEBPACK_APP_NAME}`);
       } catch (e) {
         console.log(e);
         assert.ok(false, `Error running ojet.execute with ${executeOptions}`);
@@ -93,7 +97,9 @@ describe('Webpack Test', () => {
             webpack: true
           }
         };
+        console.log(`Start scaffolding ${util.WEBPACK_JS_APP_NAME}`);
         await ojet.execute(executeOptions);
+        console.log(`Finish scaffolding ${util.WEBPACK_JS_APP_NAME}`);
 
         // Change the port in ojet.config.js
         const testDir = util.getAppDir(util.WEBPACK_JS_APP_NAME);
@@ -126,10 +132,12 @@ describe('Webpack Test', () => {
             webpack: true
           }
         };
+        console.log(`Start scaffolding ${util.WEBPACK_TS_APP_NAME}`);
         await ojet.execute(executeOptions);
+        console.log(`Finish scaffolding ${util.WEBPACK_TS_APP_NAME}`);
 
         // Change the port in ojet.config.js
-        const testDir = util.getAppDir(util.WEBPACK_JS_APP_NAME);
+        const testDir = util.getAppDir(util.WEBPACK_TS_APP_NAME);
         const fileName = path.resolve(testDir, 'ojet.config.js');
         let configRead = fs.readFileSync(fileName, 'utf-8');
         configRead = configRead.replace('return config;', 'if (config && config.devServer) config.devServer.port = 8002; return config;');
@@ -250,17 +258,22 @@ describe('Webpack Test', () => {
         const { pathToIndexHtml } = util.getAppPathData(util.WEBPACK_JS_APP_NAME);
         const indexHtmlContent = fs.readFileSync(pathToIndexHtml, { encoding: 'utf-8' });
         const hasRedwoodTheme = /<link\s.*redwood-min.css">/.test(indexHtmlContent);
+        const hasPreactThemeFile = /<link\s.*\/?\btheme\.css">/.test(indexHtmlContent);
         assert.ok(hasRedwoodTheme, `src/index.html does not have link to Redwood theme`);
+        assert.ok(hasPreactThemeFile, `src/index.html does not have link to Preact theme file`);
       }); 
       it(`${util.WEBPACK_TS_APP_NAME} should have oj-redwood-min.css link in index.html file in source`, () => {
         const { pathToIndexHtml } = util.getAppPathData(util.WEBPACK_TS_APP_NAME);
         const indexHtmlContent = fs.readFileSync(pathToIndexHtml, { encoding: 'utf-8' });
         const hasRedwoodTheme = /<link\s.*redwood-min.css">/.test(indexHtmlContent);
+        const hasPreactThemeFile = /<link\s.*\/?\btheme\.css">/.test(indexHtmlContent);
         assert.ok(hasRedwoodTheme, `src/index.html does not have link to Redwood theme`);
+        assert.ok(hasPreactThemeFile, `src/index.html does not have link to Preact theme file`);
       });
     });
     describe('Build (Release)', () => {
       const regexRedwood = /<link\s.*redwood-min.css">/;
+      const regexPreact = /<link\s.*\/?\btheme\.css">/;
       const regexInjectorThemeTag = /(<!--\s*|@@)(injector):theme(\s*-->)?/;
       const regexRedwoodTag = /(<!--\s*|@@)(css|js|img):([\w\/]+)(\s*-->)?/;
       it('should build in release mode for a vdom app', async () => {
@@ -295,6 +308,18 @@ describe('Webpack Test', () => {
         const { pathToIndexHtml, hasMatchedPattern} = checkWebIndexHTML(util.WEBPACK_TS_APP_NAME, regexRedwood);
         assert.ok(hasMatchedPattern, `${pathToIndexHtml} has a link to Redwood theme`);
       });
+      it('should have theme-redwood.css link in index.html file in staging - vdom app', () => {
+        const { pathToIndexHtml, hasMatchedPattern} = checkWebIndexHTML(util.WEBPACK_APP_NAME, regexPreact);
+        assert.ok(hasMatchedPattern, `${pathToIndexHtml} has a link to Redwood theme`);
+      });
+      it('should have theme-redwood.css link in index.html file in staging - js app', () => {
+        const { pathToIndexHtml, hasMatchedPattern} = checkWebIndexHTML(util.WEBPACK_JS_APP_NAME, regexPreact);
+        assert.ok(hasMatchedPattern, `${pathToIndexHtml} has a link to Redwood theme`);
+      });
+      it('should have theme-redwood.css link in index.html file in staging - ts app', () => {
+        const { pathToIndexHtml, hasMatchedPattern} = checkWebIndexHTML(util.WEBPACK_TS_APP_NAME, regexPreact);
+        assert.ok(hasMatchedPattern, `${pathToIndexHtml} has a link to Redwood theme`);
+      });
       it('should have <!-- css:redwood --> tag in index.html in vdom app src folder', () => {
         const { pathToIndexHtml, hasMatchedPattern} = checkSrcIndexHTML(util.WEBPACK_APP_NAME, regexRedwoodTag);
         assert.ok(hasMatchedPattern, `${pathToIndexHtml} has a Redwood theme tag`);