diff --git a/apps/circuit-compiler/src/app/components/container.tsx b/apps/circuit-compiler/src/app/components/container.tsx
index 51f583293c..d56036e44d 100644
--- a/apps/circuit-compiler/src/app/components/container.tsx
+++ b/apps/circuit-compiler/src/app/components/container.tsx
@@ -15,9 +15,17 @@ import { PrimeValue } from '../types'
 export function Container () {
   const circuitApp = useContext(CircuitAppContext)
 
-  const showCompilerLicense = (message = 'License not available') => {
-    // @ts-ignore
-    circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message })
+  const showCompilerLicense = async (message = 'License not available') => {
+    try {
+      const response = await fetch('https://raw.githubusercontent.com/iden3/circom/master/COPYING')
+      if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
+      const content = await response.text()
+      // @ts-ignore
+      circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message: content })
+    } catch (e) {
+      // @ts-ignore
+      circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message })
+    }
   }
 
   const handleVersionSelect = (version: string) => {
@@ -53,11 +61,16 @@ export function Container () {
       <article>
         <div className="pt-0 circuit_section">
           <div className="mb-1">
-            <label className="circuit_label form-check-label" htmlFor="versionSelector">
+            <label className="circuit_label form-check-label">
               <FormattedMessage id="circuit.compiler" />
             </label>
-            <CustomTooltip placement="top" tooltipId="showCompilerTooltip" tooltipClasses="text-nowrap" tooltipText={'See compiler license'}>
-              <span className="fa fa-file-text-o border-0 p-0 ml-2" onClick={() => showCompilerLicense()}></span>
+            <CustomTooltip
+              placement="bottom"
+              tooltipId="showCircumCompilerTooltip"
+              tooltipClasses="text-nowrap"
+              tooltipText='See compiler license'
+            >
+              <span className="far fa-file-certificate border-0 p-0 ml-2" onClick={() => showCompilerLicense()}></span>
             </CustomTooltip>
             <VersionList setVersion={handleVersionSelect} versionList={circuitApp.appState.versionList} currentVersion={circuitApp.appState.version} />
             <CompileOptions setCircuitAutoCompile={handleCircuitAutoCompile} setCircuitHideWarnings={handleCircuitHideWarnings} autoCompile={circuitApp.appState.autoCompile} hideWarnings={circuitApp.appState.hideWarnings} />
diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
index e97609fbac..0eccddb281 100644
--- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts
+++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -4,7 +4,7 @@ import EventManager from 'events'
 import pathModule from 'path'
 import { parse, compile, generate_witness, generate_r1cs, compiler_list } from 'circom_wasm'
 import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper'
-import { CompilationConfig, CompilerReport } from '../types'
+import { CompilationConfig, CompilerReport, ResolverOutput } from '../types'
 
 export class CircomPluginClient extends PluginClient {
   public internalEvents: EventManager
@@ -37,10 +37,7 @@ export class CircomPluginClient extends PluginClient {
       // @ts-ignore
       fileContent = await this.call('fileManager', 'readFile', path)
     }
-    this.lastParsedFiles = {
-      [path]: fileContent,
-    }
-    this.lastParsedFiles = await this.resolveDependencies(path, fileContent, this.lastParsedFiles)
+    this.lastParsedFiles = await this.resolveDependencies(path, fileContent, { [path]: { content: fileContent, parent: null } })
     const parsedOutput = parse(path, this.lastParsedFiles)
 
     try {
@@ -211,14 +208,13 @@ export class CircomPluginClient extends PluginClient {
     this.internalEvents.emit('circuit_computing_witness_done')
   }
 
-  async resolveDependencies(filePath: string, fileContent: string, output = {}, depPath: string = '', blackPath: string[] = []): Promise<Record<string, string>> {
+  async resolveDependencies(filePath: string, fileContent: string, output: ResolverOutput = {}, depPath: string = '', parent: string = ''): Promise<Record<string, string>> {
     // extract all includes
     const includes = (fileContent.match(/include ['"].*['"]/g) || []).map((include) => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
 
     await Promise.all(
       includes.map(async (include) => {
         // fix for endless recursive includes
-        if (blackPath.includes(include)) return
         let dependencyContent = ''
         let path = include
         // @ts-ignore
@@ -268,20 +264,43 @@ export class CircomPluginClient extends PluginClient {
             }
           }
         }
-        // extract all includes from the dependency content
-        const dependencyIncludes = (dependencyContent.match(/include ['"].*['"]/g) || []).map((include) => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
-
-        blackPath.push(include)
-        // recursively resolve all dependencies of the dependency
-        if (dependencyIncludes.length > 0) {
-          await this.resolveDependencies(filePath, dependencyContent, output, path, blackPath)
-          output[include] = dependencyContent
+        const fileNameToInclude = extractNameFromKey(include)
+        const similarFile = Object.keys(output).find(path => {
+          return path.indexOf(fileNameToInclude) > -1
+        })
+        const isDuplicateContent = similarFile && output[similarFile] ? output[similarFile].content === dependencyContent : false
+
+        if (output[include] && output[include].parent) {
+          // if include import already exists, remove the include import from the parent file
+          const regexPattern = new RegExp(`include ['"]${include}['"];`, 'g')
+
+          output[output[include].parent].content = output[output[include].parent].content.replace(regexPattern, "")
+        } else if (isDuplicateContent) {
+          // if include import has the same content as another file, replace the include import with the file name of the other file (similarFile)
+          if (output[similarFile].parent) output[output[similarFile].parent].content = output[output[similarFile].parent].content.replace(similarFile, include)
+          if (include !== similarFile) {
+            output[include] = output[similarFile]
+            delete output[similarFile]
+          }
         } else {
-          output[include] = dependencyContent
+          // extract all includes from the dependency content
+          const dependencyIncludes = (dependencyContent.match(/include ['"].*['"]/g) || []).map((include) => include.replace(/include ['"]/g, '').replace(/['"]/g, ''))
+          
+          output[include] = {
+            content: dependencyContent,
+            parent
+          }
+          // recursively resolve all dependencies of the dependency
+          if (dependencyIncludes.length > 0) await this.resolveDependencies(filePath, dependencyContent, output, path, include)
         }
       })
     )
-    return output
+    const result: Record<string, string> = {}
+
+    Object.keys(output).forEach((key) => {
+      result[key] = output[key].content
+    })
+    return result
   }
 
   async resolveReportPath (path: string): Promise<string> {
diff --git a/apps/circuit-compiler/src/app/types/index.ts b/apps/circuit-compiler/src/app/types/index.ts
index 029b8bea9e..71e1dbfced 100644
--- a/apps/circuit-compiler/src/app/types/index.ts
+++ b/apps/circuit-compiler/src/app/types/index.ts
@@ -84,4 +84,11 @@ export type CompileOptionsProps = {
   setCircuitHideWarnings: (value: boolean) => void,
   autoCompile: boolean,
   hideWarnings: boolean
+}
+
+export type ResolverOutput = {
+  [name: string]: {
+    content: string,
+    parent: string
+  }
 }
\ No newline at end of file
diff --git a/apps/remix-ide-e2e/src/commands/waitForElementNotContainsText.ts b/apps/remix-ide-e2e/src/commands/waitForElementNotContainsText.ts
new file mode 100644
index 0000000000..8f4696c431
--- /dev/null
+++ b/apps/remix-ide-e2e/src/commands/waitForElementNotContainsText.ts
@@ -0,0 +1,28 @@
+import { NightwatchBrowser } from 'nightwatch'
+import EventEmitter from 'events'
+
+class waitForElementNotContainsText extends EventEmitter {
+  command (this: NightwatchBrowser, id: string, value: string, timeout = 10000): NightwatchBrowser {
+    let waitId // eslint-disable-line
+    let currentValue
+    const runid = setInterval(() => {
+      this.api.getText(id, (result) => {
+        currentValue = result.value
+        if (typeof result.value === 'string' && result.value.indexOf(value) !== -1) {
+          clearInterval(runid)
+          clearTimeout(waitId)
+          this.api.assert.ok(false, `WaitForElementContainsText ${id} contains ${value} . It should not`)
+          this.emit('complete')
+        }
+      })
+    }, 200)
+
+    waitId = setTimeout(() => {
+      clearInterval(runid)
+      this.api.assert.ok(true, `"${value}" wasn't found.`)
+    }, timeout)
+    return this
+  }
+}
+
+module.exports = waitForElementNotContainsText
diff --git a/apps/remix-ide-e2e/src/helpers/init.ts b/apps/remix-ide-e2e/src/helpers/init.ts
index 572fa7a113..8e0a93b450 100644
--- a/apps/remix-ide-e2e/src/helpers/init.ts
+++ b/apps/remix-ide-e2e/src/helpers/init.ts
@@ -11,9 +11,7 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
   browser
     .url(url || 'http://127.0.0.1:8080')
     //.switchBrowserTab(0)
-    .waitForElementVisible('[id="remixTourSkipbtn"]')
-    .click('[id="remixTourSkipbtn"]')
-
+    
     .perform((done) => {
       if (!loadPlugin) return done()
       browser
@@ -54,7 +52,6 @@ export default function (browser: NightwatchBrowser, callback: VoidFunction, url
       if (preloadPlugins) {
         initModules(browser, () => {
           browser
-
             .clickLaunchIcon('solidity')
             .waitForElementVisible('[for="autoCompile"]')
             .click('[for="autoCompile"]')
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index d06f2f6f98..7e9c51e43f 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -92,6 +92,25 @@ module.exports = {
         })
   },
 
+  'Compile with remappings set in remappings.txt file #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacecreate"]')
+      .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_remix_default' })
+      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
+      .pause(1000)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .addFile('contracts/lib/storage/src/Storage.sol', { content: storageContract})
+      .addFile('remappings.txt', { content: 'storage=contracts/lib/storage/src' })
+      .addFile('contracts/Retriever.sol', { content: retrieverContract })
+      .verifyContracts(['Retriever', 'Storage'])
+  },
+
   'Deploy and use Ballot using external web3  #group2': function (browser: NightwatchBrowser) {
     browser
       .openFile('Untitled.sol')
@@ -510,4 +529,30 @@ object "Contract" {
       }
   }
 }
+`
+
+const storageContract = `
+pragma solidity >=0.8.2 <0.9.0;
+
+contract Storage {
+
+    uint256 public number;
+
+    function store(uint256 num) public {
+        number = num;
+    }
+}
+`
+
+const retrieverContract = `
+pragma solidity >=0.8.2 <0.9.0;
+
+import "storage/Storage.sol";
+
+contract Retriever is Storage {
+
+    function retrieve() public view returns (uint256){
+        return number;
+    }
+}
 `
\ No newline at end of file
diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
index 35398ef75b..38a72d5bf2 100644
--- a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -11,8 +11,8 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .pause(5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'Should load the testmigration url and refresh and still have test data #group7': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
@@ -21,8 +21,9 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]').refreshPage()
+      .pause(5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
+      .refreshPage()
   },
   'should have indexedDB storage in terminal #group1 #group7': function (browser: NightwatchBrowser) {
     browser.assert.containsText('*[data-id="terminalJournal"]', 'indexedDB')
@@ -32,16 +33,17 @@ module.exports = {
       .pause(6000)
       .switchBrowserTab(0)
       .maximizeWindow()
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
-      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
+      .pause(5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
       .openFile('README.txt')
+      .waitForElementVisible('*[id="editorView"]', 10000)
       .getEditorValue((content) => {
         browser.assert.ok(content.includes('Output from script will appear in remix terminal.'))
       })
       .click('*[data-id="treeViewLitreeViewItemcontracts"]')
       .openFile('contracts/1_Storage.sol')
+      .waitForElementVisible('*[id="editorView"]', 10000)
       .getEditorValue((content) => {
         browser.assert.ok(content.includes('function retrieve() public view returns (uint256){'))
       })
@@ -53,8 +55,8 @@ module.exports = {
       .maximizeWindow()
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .pause(5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'Should generate error in migration by deleting indexedDB and falling back to local storage with test #group5': function (browser: NightwatchBrowser) {
     browser.url('http://127.0.0.1:8080?e2e_testmigration=true')
@@ -63,8 +65,8 @@ module.exports = {
       .maximizeWindow().execute(('delete window.indexedDB'))
       .waitForElementVisible('*[data-id="skipbackup-btn"]', 5000)
       .click('*[data-id="skipbackup-btn"]')
-      .waitForElementVisible('[id="remixTourSkipbtn"]')
-      .click('[id="remixTourSkipbtn"]')
+      .pause(5000)
+      .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 10000)
   },
   'should have localstorage storage in terminal #group2 #group3 #group5': function (browser: NightwatchBrowser) {
     browser.assert.containsText('*[data-id="terminalJournal"]', 'localstorage')
@@ -74,6 +76,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .waitForElementVisible('div[data-id="filePanelFileExplorerTree"]')
       .openFile('TEST_README.txt')
+      .waitForElementVisible('*[id="editorView"]', 10000)
       .getEditorValue((content) => {
         browser.assert.equal(content, 'TEST README')
       })
@@ -96,6 +99,7 @@ module.exports = {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .click('*[data-id="treeViewLitreeViewItemtest_contracts/artifacts"]')
       .openFile('test_contracts/artifacts/Storage_metadata.json')
+      .waitForElementVisible('*[id="editorView"]', 10000)
       .getEditorValue((content) => {
         const metadata = JSON.parse(content)
         browser.assert.equal(metadata.test, 'data')
diff --git a/apps/remix-ide-e2e/src/tests/plugin_api.ts b/apps/remix-ide-e2e/src/tests/plugin_api.ts
index c0bbb316e9..adcc378f5d 100644
--- a/apps/remix-ide-e2e/src/tests/plugin_api.ts
+++ b/apps/remix-ide-e2e/src/tests/plugin_api.ts
@@ -295,7 +295,7 @@ module.exports = {
     }, null, '/')
   },
   'Should get all workspaces #group2': async function (browser: NightwatchBrowser) {
-    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"default_workspace",isGitRepo:false}, {name:"emptyworkspace",isGitRepo:false}, {name:"testspace",isGitRepo:false}], null, null)
+    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"default_workspace",isGitRepo:false,hasGitSubmodules:false}, {name:"emptyworkspace",isGitRepo:false,hasGitSubmodules:false}, {name:"testspace",isGitRepo:false,hasGitSubmodules:false}], null, null)
   },
   'Should have set workspace event #group2': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'filePanel:createWorkspace', null, { event: 'setWorkspace', args: [{ name: 'newspace', isLocalhost: false }] }, 'newspace')
@@ -309,11 +309,11 @@ module.exports = {
 
   'Should rename workspace #group2': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'filePanel:renameWorkspace', null, null, ['default_workspace', 'renamed'])
-    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"emptyworkspace",isGitRepo:false},{name:"testspace",isGitRepo:false},{name:"newspace",isGitRepo:false},{name:"renamed",isGitRepo:false}], null, null)
+    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"emptyworkspace",isGitRepo:false,hasGitSubmodules:false},{name:"testspace",isGitRepo:false,hasGitSubmodules:false},{name:"newspace",isGitRepo:false,hasGitSubmodules:false},{name:"renamed",isGitRepo:false,hasGitSubmodules:false}], null, null)
   },
   'Should delete workspace #group2': async function (browser: NightwatchBrowser) {
     await clickAndCheckLog(browser, 'filePanel:deleteWorkspace', null, null, ['testspace'])
-    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"emptyworkspace",isGitRepo:false},{name:"newspace",isGitRepo:false},{name:"renamed",isGitRepo:false}], null, null)
+    await clickAndCheckLog(browser, 'filePanel:getWorkspaces', [{name:"emptyworkspace",isGitRepo:false,hasGitSubmodules:false},{name:"newspace",isGitRepo:false,hasGitSubmodules:false},{name:"renamed",isGitRepo:false,hasGitSubmodules:false}], null, null)
   },
   // DGIT
   'Should have changes on new workspace #group3': async function (browser: NightwatchBrowser) {
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index a611600e30..0127b830ef 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -216,7 +216,7 @@ module.exports = {
       .execute(() => {
         (document.querySelector('*[data-id="basic-http-providerModalDialogContainer-react"] input[data-id="modalDialogCustomPromp"]') as any).focus()
       }, [], () => { })
-      .setValue('[data-id="modalDialogCustomPromp"]', 'https://remix-goerli.ethdevops.io')
+      .setValue('[data-id="modalDialogCustomPromp"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9')
       .modalFooterOKClick('basic-http-provider')
       .clickLaunchIcon('filePanel')
       .openFile('README.txt')
@@ -224,11 +224,11 @@ module.exports = {
       .pause(1000)
       .executeScriptInTerminal('remix.execute(\'scripts/log_tx_block.js\')')
       // check if the input of the transaction is being logged (web3 call)
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '0x775526410000000000000000000000000000000000000000000000000000000000000060464c0335b2f1609abd9de25141c0a3b49db516fc7375970dc737c32b986e88e3000000000000000000000000000000000000000000000000000000000000039e000000000000000000000000000000000000000000000000000000000000000602926b30b10e7a514d92bc71e085f5bff2687fac2856ae43ef7621bf1756fa370516d310bec5727543089be9a4d5f68471174ee528e95a2520b0ca36c2b6c6eb0000000000000000000000000000000000000000000000000000000000046f49036f5e4ea4dd042801c8841e3db8e654124305da0f11824fc1db60c405dbb39f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000', 120000)
+      .waitForElementContainsText('*[data-id="terminalJournal"]', '0x2b0006fa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004e9e0000000000000000000000000000000000000000000000000000000000004ea373ded44d6900b8b479935bee9c82176261653e334586e0fd282f569357c0777bd9d084474837ac94bf96f2e26590222a2b8e46545657c7cf06ce2833d267bd6f131b5b3fd36cb1ca3e07cf422224df0766d1a677bbdb7ee4cc0d634efa5367a302a94dac422a16b9b8d5c10fe0555924f8189f6b498bef507b1d32e7915bd4df184f51e6d79ae6a1b11d5745ce7d625cecc3bd0dc50af4f999ffb927225f5e5c019b499f5e1fdcbc70c45df61df76013d1b0d45cdf6a267dac1b4620c0db2efd251f6548509c9c69f5bd9d1ee38ac0df0c73be2774f7d2e1fb7ef5129010f29d091e3c48aed0f035fc29804c99927d33ff2a19ff526979355ac50b2542bc5d8f2d41e4f850d5981e0420807469e828b03173b96b757fbaeacda335e11b3ab8b02a48456fab35d41ca26abde751d5fca8ef5e7ba5295278b6e46ce2aab6c10b3d185a6137d3e5c28bb8dd3a797feaf35520fcb949ea074e1869e0011ef01f8162135e44bb797d3d6215ff74ffbee972c97264fc15d11c840e6a7e796dc1a418572f6dbcc842594a558e1a9e3cb7a159284e16fec758bbc303d13edc28fb6d8bb110c3a398e4ded1748da9854eb84679ad0c99bc59bea7956b521db3ed0a9057510cc11365858704989690f0d891af81b213b1f2e91e41e4998a467656eac87e7025ac2840c17f2b106df7d32a0139036bdf5d87344ca37e9ce770e0dbeb5e021d03a7d496a6695eb06d3de9258b43f3883ce155767962b52083504b19d6d609090a2f96e9724902bf1adbf57359ac1dda48a8ffe596b8d95cac1429378769a6ec2ff1c8a9c0bc343b0a6468f36696bfb202cde9f6cd5241b814096d777751b44f0cc2ac9e7ba142227e8d5f2dd8da62573953540da1abce82c59287b2f7a87a111851758c2505d8c1ded6c42a49fc5577451ee56126d2275da490baa645c3bcac0c31dabee7aa35e6cdffb56ac0d952c2583c6f50f906dfb96f5a98c49a5919031cff880bffbe371a50162a7bd0fa0398a5898eaf6ad6db868a7d807846a3592325bb4207d67ad96bac76435368962ba8944d0201c2f620fb29373a6f35c815d101af98111e9b4cc61e8ae77fc63ce375068328ec8d05b49486666fb0f756f99d2fe747c95b2a553965f304a324879393897315d310841f0a200cd156f6ca4ed2', 120000)
       // check if the logsBloom is being logged (web3 call)
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '0x00000000000000000000000000100000000000000000020000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000040000000060000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000100000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000001', 120000)
+      .waitForElementContainsText('*[data-id="terminalJournal"]', '0x0fbbd94c448fe6949f848380a1d145a974f386624b4b10aa40f9afb212b3ddeb', 120000) // hash of 4757766
       // check if the logsBloom is being logged (ethers.js call)
-      .waitForElementContainsText('*[data-id="terminalJournal"]', '"hex":"0x025cd8"', 120000)
+      .waitForElementContainsText('*[data-id="terminalJournal"]', '0x9db899cb75888a630ba50a1644c243b83d2eb38525eb828a06a5e8bb5663c0b0', 120000) // hash of 4757767
   },
 
   'Should listen on all transactions #group8': function (browser: NightwatchBrowser) {
@@ -301,21 +301,17 @@ module.exports = {
       })
       .executeScriptInTerminal(`web3.eth.getCode('0x180587b00c8642e2c7ac3a758712d97e6f7bdcc7')`) // mainnet contract
       .waitForElementContainsText('*[data-id="terminalJournal"]', '0x608060405260043610601f5760003560e01c80635c60da1b14603157602b565b36602b576029605f565b005b6029605f565b348015603c57600080fd5b5060436097565b6040516001600160a01b03909116815260200160405180910390f35b609560917f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b60d1565b565b600060c97f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc546001600160a01b031690565b905090565b90565b3660008037600080366000845af43d6000803e80801560ef573d6000f35b3d6000fdfea2646970667358221220969dbb4b1d8aec2bb348e26488dc1a33b6bcf0190f567d161312ab7ca9193d8d64736f6c63430008110033', 120000)
+      .click('*[data-id="terminalClearConsole"]')
   },
 
   'Should connect to the sepolia fork and run web3.eth.getCode in the terminal #group9': function (browser: NightwatchBrowser) {
     browser
       .switchEnvironment('vm-custom-fork')
-      .waitForElementPresent({
-        locateStrategy: 'css selector',
-        selector: 'select[data-id="runTabSelectAccount"] option[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
-        timeout: 240000
-      })
-      .waitForElementPresent('[data-id="vm-custom-fork-modal-footer-ok-react"]')
+      .waitForElementVisible('[data-id="vm-custom-fork-modal-footer-ok-react"]')
       .execute(() => {
           (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkNodeUrl"]') as any).focus()
       }, [], () => { })
-      .clearValue('*[data-id="CustomForkNodeUrl"]').pause(1000).setValue('*[data-id="CustomForkNodeUrl"]', 'https://remix-sepolia.ethdevops.io')
+      .clearValue('*[data-id="CustomForkNodeUrl"]').pause(1000).setValue('*[data-id="CustomForkNodeUrl"]', 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9')
       .execute(() => {
         (document.querySelector('*[data-id="vm-custom-forkModalDialogContainer-react"] input[data-id="CustomForkBlockNumber"]') as any).focus()
       }, [], () => { })
@@ -326,9 +322,61 @@ module.exports = {
       .click('*[data-id="CustomForkEvmType"] [value="merge"]')
       .pause(5000)
       .modalFooterOKClick('vm-custom-fork')
+      .waitForElementPresent({
+        locateStrategy: 'css selector',
+        selector: 'select[data-id="runTabSelectAccount"] option[value="0xdD870fA1b7C4700F2BD7f44238821C26f7392148"]',
+        timeout: 240000
+      })
       .pause(5000)
       .executeScriptInTerminal(`web3.eth.getCode('0x75F509A4eDA030470272DfBAf99A47D587E76709')`) // sepolia contract
       .waitForElementContainsText('*[data-id="terminalJournal"]', byteCodeInSepolia, 120000)
+      .click('*[data-id="terminalClearConsole"]')
+  },  
+
+  'Should run a free function while being connected to mainnet #group9': function (browser: NightwatchBrowser) {
+    const script = `
+    import "https://github.com/ensdomains/ens-contracts/blob/master/contracts/utils/NameEncoder.sol";
+    import "hardhat/console.sol";
+
+    abstract contract ENS {
+        function resolver(bytes32 node) public virtual view returns (Resolver);
+    }
+
+    abstract contract Resolver {
+        function addr(bytes32 node) public virtual view returns (address);
+    }
+
+    function resolveENS() view {
+        // Same address for Mainet, Ropsten, Rinkerby, Gorli and other networks;
+        ENS ens = ENS(0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e);
+        (,bytes32 node) = NameEncoder.dnsEncodeName("vitalik.eth");
+        Resolver resolver = ens.resolver(node);
+        console.log(resolver.addr(node));
+    }
+    `
+    browser
+      // .clickLaunchIcon('udapp')
+      .switchEnvironment('vm-mainnet-fork')
+      .clickLaunchIcon('filePanel')
+      .addFile('test_mainnet.sol', { content: script })
+      
+    const path = "//*[@class='view-line' and contains(.,'resolveENS') and contains(.,'view')]//span//span[contains(.,'(')]"    
+    const pathRunFunction = `//li//*[@aria-label='Run the free function "resolveENS"']`
+    browser.waitForElementVisible('#editorView')      
+      //.waitForElementPresent(pathRunFunction)
+      .pause(10000) // the parser need to parse the code
+      .useXpath()
+      .scrollToLine(16)
+      .click(path)
+      .perform(function () {
+        const actions = this.actions({ async: true });
+        return actions
+            .keyDown(this.Keys.SHIFT)
+            .keyDown(this.Keys.ALT)
+            .sendKeys('r')
+      })
+      .useCss()
+      .waitForElementContainsText('*[data-id="terminalJournal"]', '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045', 120000)
   },
   
   'Should run free function which logs in the terminal #group10': function (browser: NightwatchBrowser) {
@@ -342,7 +390,7 @@ module.exports = {
       .addFile('test.sol', { content: script })
       .scrollToLine(3)
     const path = "//*[@class='view-line' and contains(.,'runSomething') and contains(.,'view')]//span//span[contains(.,'(')]"    
-    const pathRunFunction = `//li//*[@aria-label='Run the free function "runSomething" in the Remix VM']`
+    const pathRunFunction = `//li//*[@aria-label='Run the free function "runSomething"']`
     browser.waitForElementVisible('#editorView')
       .useXpath()
       .click(path)
@@ -769,10 +817,10 @@ const scriptBlockAndTransaction = `
 // Right click on the script name and hit "Run" to execute
 (async () => {
     try {
-        web3.eth.getTransaction('0x022ccd55747677ac50f8d9dfd1bf5b843fa2f36438a28c1d0a0958e057bb3e2a').then(console.log)
-        web3.eth.getBlock(7367447).then(console.log);
-        let ethersProvider = new ethers.providers.Web3Provider(web3Provider)
-        ethersProvider.getBlock(7367447).then(console.log)
+      web3.eth.getTransaction('0x0d2baaed96425861677e87dcf6961d34e2b73ad9a0929c32a05607ca94f98d17').then(console.log).catch(console.error)
+      web3.eth.getBlock(4757766).then(console.log).catch(console.error)
+      let ethersProvider = new ethers.providers.Web3Provider(web3Provider)
+      ethersProvider.getBlock(4757767).then(console.log).catch(console.error)
     } catch (e) {
         console.log(e.message)
     }
diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts
index 1da1bba7b6..c8b391e2fd 100644
--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -382,6 +382,35 @@ module.exports = {
       })
     // No test file is added in upgradeable contract template
   },
+  'Should create circom zkp hashchecker workspace #group1': function (browser: NightwatchBrowser) {
+    browser
+      .click('*[data-id="workspacesMenuDropdown"]')
+      .click('*[data-id="workspacecreate"]')
+      .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalFooter-react"] > button')
+      .click('select[id="wstemplate"]')
+      .click('select[id="wstemplate"] option[value=hashchecker]')
+      .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+      .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
+      .pause(100)
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcircuits"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemcircuits/calculate_hash.circom"]')
+      .click('*[data-id="treeViewLitreeViewItemcircuits/calculate_hash.circom"]')
+      .pause(1000)
+      .getEditorValue((content) => {
+        browser.assert.ok(content.indexOf(`template CalculateHash() {`) !== -1,
+          'Incorrect content')
+      })
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/run_setup.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemscripts/run_verification.ts"]')
+      .waitForElementVisible('*[data-id="treeViewLitreeViewItemtemplates/groth16_verifier.sol.ejs"]')
+      .click('*[data-id="treeViewLitreeViewItemtemplates/groth16_verifier.sol.ejs"]')
+      .getEditorValue((content) => {
+        browser.assert.ok(content.indexOf(`contract Groth16Verifier {`) !== -1,
+          'Incorrect content')
+      })
+  },
 
   // WORKSPACE TEMPLATES E2E END
 
diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
index 6bc35fe9d4..0a1e1ec63b 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -255,5 +255,98 @@ module.exports = {
 
   // GIT BRANCHES E2E END
 
-  tearDown: sauce
-}
\ No newline at end of file
+  // GIT SUBMODULES E2E START
+
+  'Should clone a repository with submodules #group4': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('filePanel')
+      .waitForElementVisible('[data-id="workspaceMenuDropdown"]')
+      .click('[data-id="workspaceMenuDropdown"]')
+      .waitForElementVisible('[data-id="workspaceclone"]')
+      .click('[data-id="workspaceclone"]')
+      .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+      .click('[data-id="fileSystemModalDialogModalBody-react"]')
+      .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+      .setValue('[data-id="modalDialogCustomPromptTextClone"]', 'https://github.com/bunsenstraat/test-branch-submodule')
+      .click('[data-id="fileSystem-modal-footer-ok-react"]')
+      .waitForElementPresent('.fa-spinner')
+      .waitForElementVisible({
+        selector: '*[data-id="treeViewLitreeViewItem.git"]',
+        timeout: 60000
+      })
+      .waitForElementContainsText('[data-id="workspacesSelect"]', 'test-branch-submodule')
+      .waitForElementVisible('[data-id="updatesubmodules"]')
+      .click('[data-id="updatesubmodules"]')
+      .waitForElementPresent('.fa-spinner')
+      .waitForElementVisible({
+        selector: '*[data-id="treeViewLitreeViewItem.git"]',
+        timeout: 60000
+      })
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive"]')
+      .pause(2000)
+      .click('[data-id="treeViewDivtreeViewItemwebsite"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite/index.html"]')
+      .click('[data-id="treeViewDivtreeViewItemplugins"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins/README.md"]')
+      .click('[data-id="treeViewDivtreeViewItemrecursive"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/README.md"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins"]')
+      .click('[data-id="treeViewDivtreeViewItemrecursive/plugins"]')
+      .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins/build"]')
+  },
+  'When switching branches the submodules should dissappear #group4': function (browser: NightwatchBrowser) {
+    browser
+    .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
+    .click('[data-id="workspaceGitBranchesDropdown"]')
+    .waitForElementVisible('[data-id="custom-dropdown-menu"]')
+    .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/second')
+    .waitForElementPresent('[data-id="workspaceGit-origin/second"]')
+    .click('[data-id="workspaceGit-origin/second"]')
+    .waitForElementNotPresent('[data-id="treeViewDivtreeViewItemplugins"]')
+    .waitForElementNotPresent('[data-id="treeViewDivtreeViewItemwebsite"]')
+  },
+  'When switching to main update the modules #group4': function (browser: NightwatchBrowser) {
+    browser
+    .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
+    .click('[data-id="workspaceGitBranchesDropdown"]')
+    .waitForElementVisible('[data-id="custom-dropdown-menu"]')
+    .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/main')
+    .waitForElementPresent('[data-id="workspaceGit-origin/main"]')
+    .click('[data-id="workspaceGit-origin/main"]')
+    .waitForElementVisible('[data-id="updatesubmodules"]')
+    .click('[data-id="updatesubmodules"]')
+    .waitForElementPresent('.fa-spinner')
+    .waitForElementVisible({
+      selector: '*[data-id="treeViewLitreeViewItem.git"]',
+      timeout: 60000
+    })
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite"]')
+    .pause(2000)
+    .click('[data-id="treeViewDivtreeViewItemwebsite"]')
+    .click('[data-id="treeViewDivtreeViewItemwebsite"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemwebsite/index.html"]')
+    .click('[data-id="treeViewDivtreeViewItemplugins"]')
+    .click('[data-id="treeViewDivtreeViewItemplugins"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemplugins/README.md"]')
+    .click('[data-id="treeViewDivtreeViewItemrecursive"]')
+    .click('[data-id="treeViewDivtreeViewItemrecursive"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/README.md"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins"]')
+    .click('[data-id="treeViewDivtreeViewItemrecursive/plugins"]')
+    .waitForElementVisible('[data-id="treeViewDivtreeViewItemrecursive/plugins/build"]')
+  },
+
+  tearDown: sauce,
+}
+
+
+const gitmodules = `[submodule "subdemo3"]
+path = subdemo3
+url = https://github.com/bunsenstraat/empty3
+[submodule "testactionsub"]
+path = testactionsub
+url = https://github.com/bunsenstraat/testactions
+`
\ No newline at end of file
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 4c356ca76f..ada7b9cca9 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -69,6 +69,7 @@ declare module 'nightwatch' {
     switchWorkspace: (workspaceName: string) => NightwatchBrowser
     switchEnvironment: (provider: string) => NightwatchBrowser
     connectToExternalHttpProvider: (url: string, identifier: string) => NightwatchBrowser
+    waitForElementNotContainsText: (id: string, value: string, timeout: number = 10000) => NightwatchBrowser
   }
 
   export interface NightwatchBrowser {
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index 2ad363952f..7c4b13e928 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -65,6 +65,7 @@ const remixLib = require('@remix-project/remix-lib')
 import { QueryParams } from '@remix-project/remix-lib'
 import { SearchPlugin } from './app/tabs/search'
 import { ElectronProvider } from './app/files/electronProvider'
+import { CopilotSuggestion } from './app/plugins/copilot/suggestion-service/copilot-suggestion'
 
 const Storage = remixLib.Storage
 const RemixDProvider = require('./app/files/remixDProvider')
@@ -163,8 +164,11 @@ class AppComponent {
       '6fd22d6fe5549ad4c4d8fd3ca0b7816b.mod': 35 // remix desktop
     }
     this.showMatamo = matomoDomains[window.location.hostname] && !Registry.getInstance().get('config').api.exists('settings/matomo-analytics')
-    this.walkthroughService = new WalkthroughService(appManager, this.showMatamo)
+
     this.platform = isElectron() ? 'desktop' : 'web'
+    this.showEnter = matomoDomains[window.location.hostname] && !localStorage.getItem('hadUsageTypeAsked')
+    
+    this.walkthroughService = new WalkthroughService(appManager, !this.showMatamo || !this.showEnter)
 
     const hosts = ['127.0.0.1:8080', '192.168.0.101:8080', 'localhost:8080']
     // workaround for Electron support
@@ -223,8 +227,9 @@ class AppComponent {
     // ----------------- ContractFlattener ----------------------------
     const contractFlattener = new ContractFlattener()
 
-    // ----------------- Open AI --------------------------------------
+    // ----------------- AI --------------------------------------
     const openaigpt = new OpenAIGpt()
+    const copilotSuggestion = new CopilotSuggestion()
 
     // ----------------- import content service ------------------------
     const contentImport = new CompilerImports()
@@ -349,7 +354,8 @@ class AppComponent {
       contractFlattener,
       solidityScript,
       templates,
-      openaigpt
+      openaigpt,
+      copilotSuggestion
     ])
 
     //---- fs plugin
diff --git a/apps/remix-ide/src/app/files/dgitProvider.ts b/apps/remix-ide/src/app/files/dgitProvider.ts
index a271c48436..da76ea8c4e 100644
--- a/apps/remix-ide/src/app/files/dgitProvider.ts
+++ b/apps/remix-ide/src/app/files/dgitProvider.ts
@@ -22,7 +22,7 @@ const profile = {
   description: 'Decentralized git provider',
   icon: 'assets/img/fileManager.webp',
   version: '0.0.1',
-  methods: ['init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'reset', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pin', 'pull', 'pinList', 'unPin', 'setIpfsConfig', 'zip', 'setItem', 'getItem', 'version'],
+  methods: ['init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'reset', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pin', 'pull', 'pinList', 'unPin', 'setIpfsConfig', 'zip', 'setItem', 'getItem', 'version', 'updateSubmodules'],
   kind: 'file-system'
 }
 class DGitProvider extends Plugin {
@@ -69,7 +69,7 @@ class DGitProvider extends Plugin {
     if (!workspace) return
     return {
       fs: window.remixFileSystemCallback,
-      dir: addSlash(workspace.absolutePath)
+      dir: addSlash(path.join(workspace.absolutePath, dir || '')),
     }
   }
 
@@ -177,16 +177,39 @@ class DGitProvider extends Plugin {
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       await this.call('isogit', 'checkout', cmd)
     } else {
+      const gitmodules = await this.parseGitmodules() || []
       await git.checkout({
         ...await this.getGitConfig(),
         ...cmd
       })
+      const newgitmodules = await this.parseGitmodules() || []
+      // find the difference between the two gitmodule versions
+      const toRemove = gitmodules.filter((module) => {
+        return !newgitmodules.find((newmodule) => {
+          return newmodule.name === module.name
+        })
+      })
+  
+      for (const module of toRemove) {
+        const path = (await this.getGitConfig(module.path)).dir
+        if (await window.remixFileSystem.exists(path)) {
+          const stat = await window.remixFileSystem.stat(path)
+          try {
+            if (stat.isDirectory()) {
+              await window.remixFileSystem.unlink((await this.getGitConfig(module.path)).dir)
+            }
+          } catch (e) {
+            // do nothing
+          }
+        }
+      }
     }
     if (refresh) {
       setTimeout(async () => {
         await this.call('fileManager', 'refresh')
       }, 1000)
     }
+
     this.emit('checkout')
   }
 
@@ -418,7 +441,7 @@ class DGitProvider extends Plugin {
         ...await this.parseInput(input),
         ...await this.getGitConfig()
       }
-
+      this.call('terminal', 'logHtml', `Cloning ${input.url}...`)
       const result = await git.clone(cmd)
       if (!workspaceExists) {
         setTimeout(async () => {
@@ -430,6 +453,137 @@ class DGitProvider extends Plugin {
     }
   }
 
+  async parseGitmodules (dir = '') {
+    try {
+      const gitmodules = await this.call('fileManager', 'readFile', path.join(dir, '.gitmodules'))
+      if (gitmodules) {
+        const lines = gitmodules.split('\n')
+        let currentModule = {}
+        let modules = []
+        for (let line of lines) {
+          line = line.trim()
+          if (line.startsWith('[')) {
+            if (currentModule.path) {
+              modules.push(currentModule)
+            }
+            currentModule = {}
+            currentModule.name = line.replace('[submodule "', '').replace('"]', '')
+          } else if (line.startsWith('url')) {
+            currentModule.url = line.replace('url = ', '')
+          } else if (line.startsWith('path')) {
+            currentModule.path = line.replace('path = ', '')
+          }
+        }
+        if (currentModule.path) {
+          modules.push(currentModule)
+        }
+        return modules
+      }
+    } catch (e) {
+      // do nothing
+    }
+  }
+
+  async updateSubmodules(input) {
+    try {
+      const currentDir = (input && input.dir) || ''
+      const gitmodules = await this.parseGitmodules(currentDir)
+      this.call('terminal', 'logHtml', `Found ${(gitmodules && gitmodules.length) || 0} submodules in ${currentDir || '/'}`)
+      //parse gitmodules
+      if (gitmodules) {
+        for (let module of gitmodules) {
+          const dir = path.join(currentDir, module.path)
+          const targetPath = (await this.getGitConfig(dir)).dir
+          if (await window.remixFileSystem.exists(targetPath)) {
+            const stat = await window.remixFileSystem.stat(targetPath)
+            try {
+              if (stat.isDirectory()) {
+                await window.remixFileSystem.unlink(targetPath)
+              }
+            } catch (e) {
+              // do nothing
+            }
+          }
+        }
+        for (let module of gitmodules) {
+          const dir = path.join(currentDir, module.path)
+          // if url contains git@github.com: convert it
+          if(module.url && module.url.startsWith('git@github.com:')) {
+            module.url = module.url.replace('git@github.com:', 'https://github.com/')
+          }
+          try {
+            const cmd = {
+              url: module.url,
+              singleBranch: true,
+              depth: 1,
+              ...await this.parseInput(input),
+              ...await this.getGitConfig(dir)
+            }
+            this.call('terminal', 'logHtml', `Cloning submodule ${dir}...`)
+            await git.clone(cmd)
+            this.call('terminal', 'logHtml', `Cloned successfully submodule ${dir}...`)
+            
+            const commitHash = await git.resolveRef({
+              ...await this.getGitConfig(currentDir),
+              ref: 'HEAD'
+            })
+
+            const result = await git.walk({
+              ...await this.getGitConfig(currentDir),
+              trees: [git.TREE({ ref: commitHash })],
+              map: async function (filepath, [A]) {
+                if(filepath === module.path) {
+                  return await A.oid()
+                }
+              }
+            })
+            if(result && result.length) {
+              this.call('terminal', 'logHtml', `Checking out submodule ${dir} to ${result[0]} in directory ${dir}`)
+              await git.fetch({
+                ...await this.parseInput(input),
+                ...await this.getGitConfig(dir),
+                singleBranch: true,
+                ref: result[0]
+              })
+
+              await git.checkout({
+                ...await this.getGitConfig(dir),
+                ref: result[0]
+              })
+              
+              const log = await git.log({
+                ...await this.getGitConfig(dir),
+              })
+
+              if(log[0].oid !== result[0]) {
+                this.call('terminal', 'log', {
+                  type: 'error',
+                  value: `Could not checkout submodule to ${result[0]}`
+                })} else {              
+                this.call('terminal', 'logHtml',`Checked out submodule ${dir} to ${result[0]}`)
+              }
+            }
+
+            await this.updateSubmodules({
+              ...input,
+              dir
+            })
+          } catch (e) {
+            this.call('terminal', 'log', { type: 'error', value: `[Cloning]: Error occured! ${e}` })
+            console.log(e)
+          }
+        }
+
+        setTimeout(async () => {
+          await this.call('fileManager', 'refresh')
+        }, 1000)
+      }
+    } catch (e) {
+      this.call('terminal', 'log', { type: 'error', value: `[Cloning]: Error occured! ${e}` })
+      // do nothing
+    }
+  }
+
   async push(input) {
     const cmd = {
       force: input.force,
diff --git a/apps/remix-ide/src/app/files/fileManager.ts b/apps/remix-ide/src/app/files/fileManager.ts
index cb77a5c856..b31d953f08 100644
--- a/apps/remix-ide/src/app/files/fileManager.ts
+++ b/apps/remix-ide/src/app/files/fileManager.ts
@@ -25,7 +25,7 @@ const profile = {
   methods: ['closeAllFiles', 'closeFile', 'file', 'exists', 'open', 'writeFile', 'writeMultipleFiles', 'writeFileNoRewrite',
     'readFile', 'copyFile', 'copyDir', 'rename', 'mkdir', 'readdir', 'dirList', 'fileList', 'remove', 'getCurrentFile', 'getFile',
     'getFolder', 'setFile', 'switchFile', 'refresh', 'getProviderOf', 'getProviderByName', 'getPathFromUrl', 'getUrlFromPath',
-    'saveCurrentFile', 'setBatchFiles', 'isGitRepo', 'isFile', 'isDirectory'
+    'saveCurrentFile', 'setBatchFiles', 'isGitRepo', 'isFile', 'isDirectory', 'hasGitSubmodule'
   ],
   kind: 'file-system'
 }
@@ -933,6 +933,13 @@ class FileManager extends Plugin {
     return exists
   }
 
+  async hasGitSubmodules(): Promise<boolean> {
+    const path = '.gitmodules'
+    const exists = await this.exists(path)
+
+    return exists
+  }
+
 
   async moveFileIsAllowed (src: string, dest: string) {
     try {
diff --git a/apps/remix-ide/src/app/files/fileProvider.ts b/apps/remix-ide/src/app/files/fileProvider.ts
index 9ff685ec1a..149b4b1c6c 100644
--- a/apps/remix-ide/src/app/files/fileProvider.ts
+++ b/apps/remix-ide/src/app/files/fileProvider.ts
@@ -188,23 +188,8 @@ export default class FileProvider {
         if (!stat.isDirectory()) {
           return await this.removeFile(path)
         } else {
-          const items = await window.remixFileSystem.readdir(path)
-          if (items.length !== 0) {
-            for (const item of items) {
-              const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
-              if ((await window.remixFileSystem.stat(curPath)).isDirectory()) { // delete folder
-                await this.remove(curPath)
-              } else { // delete file
-                await this.removeFile(curPath)
-              }
-            }
-            await window.remixFileSystem.rmdir(path)
-            this.event.emit('fileRemoved', this._normalizePath(path))
-          } else {
-            // folder is empty
-            await window.remixFileSystem.rmdir(path)
-            this.event.emit('fileRemoved', this._normalizePath(path))
-          }          
+          await window.remixFileSystem.unlink(path)
+          this.event.emit('fileRemoved', this._normalizePath(path))        
         }
       } catch (e) {
         console.log(e)
diff --git a/apps/remix-ide/src/app/plugins/copilot/suggestion-service/copilot-suggestion.ts b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/copilot-suggestion.ts
new file mode 100644
index 0000000000..9ed52afe98
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/copilot-suggestion.ts
@@ -0,0 +1,79 @@
+import {Plugin} from '@remixproject/engine'
+import {SuggestionService, SuggestOptions} from './suggestion-service'
+const _paq = (window._paq = window._paq || []) //eslint-disable-line
+
+const profile = {
+  name: 'copilot-suggestion',
+  displayName: 'copilot-suggestion',
+  description: 'Get Solidity suggestions in editor',
+  methods: ['suggest', 'init', 'uninstall', 'status', 'isActivate'],
+  version: '0.1.0-alpha',
+  maintainedBy: "Remix"
+}
+
+export class CopilotSuggestion extends Plugin {
+  service: SuggestionService
+  context: string
+  ready: boolean
+  constructor() {
+    super(profile)
+    this.service = new SuggestionService()
+    this.context = ''
+    this.service.events.on('progress', (data) => {
+      this.emit('loading', data)
+    })
+    this.service.events.on('done', (data) => {
+    })
+    this.service.events.on('ready', (data) => {
+      this.ready = true
+    })    
+  }
+
+  status () {
+    return this.ready
+  }
+
+  async isActivate () {
+    try {
+      return await this.call('settings', 'get', 'settings/copilot/suggest/activate')
+    } catch (e) {
+      console.error(e)
+      return false
+    }
+  }
+
+  async suggest(content: string) {
+    if (!await this.call('settings', 'get', 'settings/copilot/suggest/activate')) return { output: [{ generated_text: ''}]}
+
+    const max_new_tokens = await this.call('settings', 'get', 'settings/copilot/suggest/max_new_tokens')
+    const temperature = await this.call('settings', 'get', 'settings/copilot/suggest/temperature')
+    const options: SuggestOptions = {
+      do_sample: false,
+      top_k: 0,
+      temperature,
+      max_new_tokens
+    }
+    return this.service.suggest(this.context ? this.context + '\n\n' + content : content, options)
+  }
+
+  async loadModeContent() {
+    let importsContent = ''
+    const imports = await this.call('codeParser', 'getImports')
+    for (const imp of imports.modules) {
+      try {
+        importsContent += '\n\n' + (await this.call('contentImport', 'resolve', imp)).content
+      } catch (e) {
+        console.log(e)
+      }      
+    }
+    return importsContent
+  }
+
+  async init() {
+    return this.service.init()
+  }
+
+  async uninstall() {
+    this.service.terminate()
+  }
+}
\ No newline at end of file
diff --git a/apps/remix-ide/src/app/plugins/copilot/suggestion-service/suggestion-service.ts b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/suggestion-service.ts
new file mode 100644
index 0000000000..fefe485490
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/suggestion-service.ts
@@ -0,0 +1,100 @@
+import EventEmitter from 'events'
+
+export type SuggestOptions = { max_new_tokens: number, temperature: number, top_k: number, do_sample: boolean }
+
+export class SuggestionService {
+  worker: Worker
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  responses: { [key: number]: Function }
+  events: EventEmitter
+  current: number
+  constructor() {
+    this.worker = new Worker(new URL('./worker.js', import.meta.url), {
+      type: 'module'
+    });
+    this.events = new EventEmitter()
+    this.responses = {}
+    this.current
+  }
+
+  terminate(): void {
+    this.worker.terminate()
+    this.worker = new Worker(new URL('./worker.js', import.meta.url), {
+      type: 'module'
+    });
+  }
+
+  async init() {
+    const onMessageReceived = (e) => {
+      switch (e.data.status) {
+      case 'initiate':
+        this.events.emit(e.data.status, e.data)
+        // Model file start load: add a new progress item to the list.
+        break;
+
+      case 'progress':
+        this.events.emit(e.data.status, e.data)
+        // Model file progress: update one of the progress items.
+        break;
+
+      case 'done':
+        this.events.emit(e.data.status, e.data)
+        // Model file loaded: remove the progress item from the list.
+        break;
+
+      case 'ready':
+        this.events.emit(e.data.status, e.data)
+        // Pipeline ready: the worker is ready to accept messages.
+        break;
+
+      case 'update':
+        this.events.emit(e.data.status, e.data)
+        // Generation update: update the output text.
+        break;
+
+      case 'complete':
+        if (this.responses[e.data.id]) {
+          if (this.current === e.data.id) {
+            this.responses[e.data.id](null, e.data)
+          } else {
+            this.responses[e.data.id]('aborted')
+          }          
+          delete this.responses[e.data.id]
+          this.current = null
+        }
+          
+        // Generation complete: re-enable the "Generate" button
+        break;
+      }
+    };
+
+    // Attach the callback function as an event listener.
+    this.worker.addEventListener('message', onMessageReceived)
+
+    this.worker.postMessage({
+      cmd: 'init',
+      model: 'Pipper/finetuned_sol'
+    })
+  }
+
+  suggest (content: string, options: SuggestOptions)  {
+    return new Promise((resolve, reject) => {
+      if (this.current) return reject(new Error('already running'))
+      const timespan = Date.now()
+      this.current = timespan
+      this.worker.postMessage({
+        id: timespan,
+        cmd: 'suggest',
+        text: content,
+        max_new_tokens: options.max_new_tokens,
+        temperature: options.temperature,
+        top_k: options.top_k,
+        do_sample: options.do_sample
+      })
+      this.responses[timespan] = (error, result) => {
+        if (error) return reject(error)
+        resolve(result)
+      }
+    })    
+  }
+}
\ No newline at end of file
diff --git a/apps/remix-ide/src/app/plugins/copilot/suggestion-service/worker.js b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/worker.js
new file mode 100644
index 0000000000..a5affc48b1
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/copilot/suggestion-service/worker.js
@@ -0,0 +1,90 @@
+
+import { pipeline, env } from '@xenova/transformers';
+
+env.allowLocalModels = true;
+
+const instance = null
+/**
+ * This class uses the Singleton pattern to ensure that only one instance of the pipeline is loaded.
+ */
+class CodeCompletionPipeline {
+  static task = 'text-generation';
+  static model = null
+  static instance = null;
+    
+  static async getInstance(progress_callback = null) {
+    if (this.instance === null) {
+      this.instance = pipeline(this.task, this.model, { progress_callback });
+    }
+
+    return this.instance;
+  }
+}
+
+// Listen for messages from the main thread
+self.addEventListener('message', async (event) => {
+  const {
+    id, model, text, max_new_tokens, cmd,
+
+    // Generation parameters
+    temperature,
+    top_k,
+    do_sample,
+  } = event.data;
+
+  if (cmd === 'init') {
+    // Retrieve the code-completion pipeline. When called for the first time,
+    // this will load the pipeline and save it for future use.
+    CodeCompletionPipeline.model = model
+    await CodeCompletionPipeline.getInstance(x => {
+      // We also add a progress callback to the pipeline so that we can
+      // track model loading.
+      self.postMessage(x);
+    });
+    return
+  }
+
+  if (!CodeCompletionPipeline.instance) {
+    // Send the output back to the main thread
+    self.postMessage({
+      id,
+      status: 'error',
+      message: 'model not yet loaded'
+    });  
+  }
+
+  if (cmd === 'suggest') {
+    // Retrieve the code-completion pipeline. When called for the first time,
+    // this will load the pipeline and save it for future use.
+    let generator = await CodeCompletionPipeline.getInstance(x => {
+      // We also add a progress callback to the pipeline so that we can
+      // track model loading.
+      self.postMessage(x);
+    });
+
+    // Actually perform the code-completion
+    let output = await generator(text, {
+      max_new_tokens,
+      temperature,
+      top_k,
+      do_sample,
+
+      // Allows for partial output
+      callback_function: x => {
+        /*self.postMessage({
+          id,
+          status: 'update',
+          output: generator.tokenizer.decode(x[0].output_token_ids, { skip_special_tokens: true })
+        });
+        */
+      }
+    });
+
+    // Send the output back to the main thread
+    self.postMessage({
+      id,
+      status: 'complete',
+      output: output,
+    });   
+  }
+});
\ No newline at end of file
diff --git a/apps/remix-ide/src/app/plugins/openaigpt.tsx b/apps/remix-ide/src/app/plugins/openaigpt.tsx
index e95babe00a..9d1e121722 100644
--- a/apps/remix-ide/src/app/plugins/openaigpt.tsx
+++ b/apps/remix-ide/src/app/plugins/openaigpt.tsx
@@ -38,9 +38,11 @@ export class OpenAIGpt extends Plugin {
     }
     
     if (result && result.choices && result.choices.length) {
-      this.call('terminal', 'log', { type: 'typewritersuccess', value: result.choices[0].message.content })    
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: result.choices[0].message.content })    
+    } else if  (result.error) {
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: result.error })
     } else {
-      this.call('terminal', 'log', { type: 'typewritersuccess', value: 'No response...' })
+      this.call('terminal', 'log', { type: 'typewriterwarning', value: 'No response...' })
     }
     return result.data
   }
diff --git a/apps/remix-ide/src/app/plugins/solidity-script.tsx b/apps/remix-ide/src/app/plugins/solidity-script.tsx
index 4da5425a34..5ea9bdaf8c 100644
--- a/apps/remix-ide/src/app/plugins/solidity-script.tsx
+++ b/apps/remix-ide/src/app/plugins/solidity-script.tsx
@@ -55,6 +55,7 @@ export class SolidityScript extends Plugin {
       })
     }
 
+    await this.call('compilerArtefacts', 'saveCompilerAbstract', 'script.sol', compilation)
     // get the contract
     const contract = compilation.getContract('SolidityScript')
     if (!contract) {
@@ -62,7 +63,7 @@ export class SolidityScript extends Plugin {
       return
     }
     const bytecode = '0x' + contract.object.evm.bytecode.object
-    const web3 = await this.call('blockchain', 'web3VM')
+    const web3 = await this.call('blockchain', 'web3')
     const accounts = await this.call('blockchain', 'getAccounts')
     if (!accounts || accounts.length === 0) {
       throw new Error('no account available')
@@ -73,13 +74,27 @@ export class SolidityScript extends Plugin {
       from: accounts[0],
       data: bytecode
     }
-    const receipt = await web3.eth.sendTransaction(tx)
+    let receipt
+    try {
+      receipt = await web3.eth.sendTransaction(tx, null, { checkRevertBeforeSending: false, ignoreGasPricing: true })
+    } catch (e) {
+      this.call('terminal', 'logHtml', e.message)
+      return
+    }
+    
     tx = {
       from: accounts[0],
       to: receipt.contractAddress,
       data: '0x69d4394b' // function remixRun() public
     }
-    const receiptCall = await web3.eth.sendTransaction(tx)
+    let receiptCall 
+    
+    try {
+      receiptCall = await web3.eth.sendTransaction(tx, null, { checkRevertBeforeSending: false, ignoreGasPricing: true })
+    } catch (e) {
+      this.call('terminal', 'logHtml', e.message)
+      return
+    }   
 
     const hhlogs = await web3.remix.getHHLogsForTx(receiptCall.transactionHash)
 
diff --git a/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx
index 21f7845d33..c78aca825e 100644
--- a/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx
+++ b/apps/remix-ide/src/app/providers/goerli-vm-fork-provider.tsx
@@ -18,7 +18,7 @@ export class GoerliForkVMProvider extends BasicVMProvider {
     )
     this.blockchain = blockchain
     this.fork = 'shanghai'
-    this.nodeUrl = 'https://remix-sepolia.ethdevops.io'
+    this.nodeUrl = 'https://remix-goerli.ethdevops.io'
     this.blockNumber = 'latest'
   }
 
diff --git a/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx b/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx
index 03d7248adb..b88b4a4439 100644
--- a/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx
+++ b/apps/remix-ide/src/app/providers/sepolia-vm-fork-provider.tsx
@@ -18,7 +18,7 @@ export class SepoliaForkVMProvider extends BasicVMProvider {
     )
     this.blockchain = blockchain
     this.fork = 'shanghai'
-    this.nodeUrl = 'https://remix-sepolia.ethdevops.io'
+    this.nodeUrl = 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9'
     this.blockNumber = 'latest'
   }
 
diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
index 6b7dc748e5..a645dfc06c 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
@@ -104,6 +104,8 @@
   "filePanel.burnable": "Burnable",
   "filePanel.pausable": "Pausable",
   "filePanel.semaphore": "Semaphore",
+  "filePanel.hashchecker": "Hash Checker",
+  "filePanel.rln": "Rate-Limiting Nullifier",
   "filePanel.transparent": "Transparent",
   "filePanel.initGitRepoTitle": "Check option to initialize workspace as a new git repository",
   "filePanel.switchToBranchTitle1": "Checkout new branch from remote branch",
diff --git a/apps/remix-ide/src/app/tabs/locales/en/home.json b/apps/remix-ide/src/app/tabs/locales/en/home.json
index bf51810b49..020405292b 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/home.json
@@ -6,9 +6,9 @@
   "home.learnMore": "Learn more",
   "home.here": "here",
   "home.featured": "Featured",
-  "home.jumpIntoWeb3": "WE NEED YOUR HELP",
-  "home.jumpIntoWeb3More": "Go to survey",
-  "home.jumpIntoWeb3Text": "Remixers... Have a spare moment? Please help us improve your Remix experience with this one-minute survey.",
+  "home.jumpIntoWeb3": "JUMP INTO WEB3",
+  "home.jumpIntoWeb3More": "More",
+  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
   "home.remixYouTube": "WATCH TO LEARN",
   "home.remixYouTubeText1": "Video Tips from the Remix Team",
   "home.remixYouTubeMore": "Watch",
diff --git a/apps/remix-ide/src/app/tabs/locales/en/homeReleaseDetails.json b/apps/remix-ide/src/app/tabs/locales/en/homeReleaseDetails.json
new file mode 100644
index 0000000000..06a2f565d7
--- /dev/null
+++ b/apps/remix-ide/src/app/tabs/locales/en/homeReleaseDetails.json
@@ -0,0 +1,11 @@
+{
+  "homeReleaseDetails.title": "v0.38.0 RELEASE HIGHLIGHTS",
+  "homeReleaseDetails.highlight1": "Alpha release for Solidity co-pilot",
+  "homeReleaseDetails.highlight2": "Define Solidity remappings in remappings.txt file",
+  "homeReleaseDetails.highlight3": "Run free function for any selected environment",
+  "homeReleaseDetails.highlight4": "New Circom ZKP templates: Hash Checker & Rate Limiting Nullifier",
+  "homeReleaseDetails.more": "Read More"
+}
+
+
+
diff --git a/apps/remix-ide/src/app/tabs/locales/en/index.js b/apps/remix-ide/src/app/tabs/locales/en/index.js
index 8da7dd179f..7f347165db 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/index.js
+++ b/apps/remix-ide/src/app/tabs/locales/en/index.js
@@ -1,6 +1,7 @@
 import debuggerJson from './debugger.json';
 import filePanelJson from './filePanel.json';
 import homeJson from './home.json';
+import homeReleaseDetailsJson from './homeReleaseDetails.json';
 import panelJson from './panel.json';
 import pluginManagerJson from './pluginManager.json';
 import searchJson from './search.json';
@@ -20,6 +21,7 @@ export default {
   ...debuggerJson,
   ...filePanelJson,
   ...homeJson,
+  ...homeReleaseDetailsJson,
   ...panelJson,
   ...pluginManagerJson,
   ...searchJson,
diff --git a/apps/remix-ide/src/app/tabs/locales/en/settings.json b/apps/remix-ide/src/app/tabs/locales/en/settings.json
index 2752f19f75..b290156eec 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/settings.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/settings.json
@@ -36,5 +36,9 @@
   "settings.port": "PORT",
   "settings.projectID": "PROJECT ID",
   "settings.projectSecret": "PROJECT SECRET",
-  "settings.analyticsInRemix": "Analytics in Remix IDE"
+  "settings.analyticsInRemix": "Analytics in Remix IDE",
+  "settings.copilot": "Solidity copilot - Alpha",
+  "settings.copilot.activate": "Load & Activate copilot",
+  "settings.copilot.max_new_tokens": "Maximum number of words to generate",
+  "settings.copilot.temperature": "Temperature"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/es/home.json b/apps/remix-ide/src/app/tabs/locales/es/home.json
index 0c5633def3..5d0ab22fdd 100644
--- a/apps/remix-ide/src/app/tabs/locales/es/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/es/home.json
@@ -6,9 +6,9 @@
   "home.learnMore": "Aprender más",
   "home.here": "aquí",
   "home.featured": "Destacado",
-  "home.jumpIntoWeb3": "NECESITAMOS TU AYUDA",
-  "home.jumpIntoWeb3More": "Ir a la encuesta",
-  "home.jumpIntoWeb3Text": "Remixers... ¿Tienes un momento libre? Por favor, ayúdanos a mejorar tu experiencia en Remix con esta encuesta de un minuto.",
+  "home.jumpIntoWeb3": "JUMP INTO WEB3",
+  "home.jumpIntoWeb3More": "More",
+  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
   "home.remixYouTube": "MIRA PARA APRENDER",
   "home.remixYouTubeText1": "Vídeo de consejos del equipo de Remix",
   "home.remixYouTubeMore": "Mirar",
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/home.json b/apps/remix-ide/src/app/tabs/locales/fr/home.json
index cc838b00b7..c6a4fc865c 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/home.json
@@ -6,9 +6,9 @@
   "home.learnMore": "En savoir plus",
   "home.here": "ici",
   "home.featured": "Recommandé",
-  "home.jumpIntoWeb3": "NOUS AVONS BESOINS DE VOTRE AIDE",
-  "home.jumpIntoWeb3More": "Accéder au sondage",
-  "home.jumpIntoWeb3Text": "Remixers... Vous avez un moment? Aidez-nous à améliorer votre expérience de remix avec cette enquête d'une minute.",
+  "home.jumpIntoWeb3": "JUMP INTO WEB3",
+  "home.jumpIntoWeb3More": "More",
+  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
   "home.remixYouTube": "REGARDER POUR APPRENDRE",
   "home.remixYouTubeText1": "Conseils vidéo de l'équipe de Remix",
   "home.remixYouTubeMore": "Regarder",
diff --git a/apps/remix-ide/src/app/tabs/locales/it/home.json b/apps/remix-ide/src/app/tabs/locales/it/home.json
index 04bef435f3..1a4b73379d 100644
--- a/apps/remix-ide/src/app/tabs/locales/it/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/it/home.json
@@ -6,9 +6,9 @@
   "home.learnMore": "Scopri di più",
   "home.here": "qui",
   "home.featured": "In Evidenza",
-  "home.jumpIntoWeb3": "ABBIAMO BISOGNO DEL TUO AIUTO",
-  "home.jumpIntoWeb3More": "Vai al sondaggio",
-  "home.jumpIntoWeb3Text": "Remixers... Hai un momento libero? Aiutaci a migliorare la tua esperienza Remix con questo sondaggio di un minuto.",
+  "home.jumpIntoWeb3": "JUMP INTO WEB3",
+  "home.jumpIntoWeb3More": "More",
+  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
   "home.remixYouTube": "GUARDA PER IMPARARE",
   "home.remixYouTubeText1": "Video di Suggerimenti dal Team di Remix",
   "home.remixYouTubeMore": "Guarda",
diff --git a/apps/remix-ide/src/app/tabs/locales/zh/home.json b/apps/remix-ide/src/app/tabs/locales/zh/home.json
index 8612fbed1a..40a658b239 100644
--- a/apps/remix-ide/src/app/tabs/locales/zh/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/zh/home.json
@@ -6,9 +6,9 @@
   "home.learnMore": "了解更多",
   "home.here": "这里",
   "home.featured": "精选",
-  "home.jumpIntoWeb3": "我们需要你的帮助",
-  "home.jumpIntoWeb3More": "去填调查表",
-  "home.jumpIntoWeb3Text": "Remixers... 有空吗？请填写这份一分钟调查问卷，帮助我们改善您的 Remix 体验。",
+  "home.jumpIntoWeb3": "JUMP INTO WEB3",
+  "home.jumpIntoWeb3More": "More",
+  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
   "home.remixYouTube": "观看学习",
   "home.remixYouTubeText1": "来自 Remix 团队的视频小贴士",
   "home.remixYouTubeMore": "观看",
diff --git a/apps/remix-ide/src/app/tabs/settings-tab.tsx b/apps/remix-ide/src/app/tabs/settings-tab.tsx
index 8eeea2b0fb..b3b94e7a89 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.tsx
+++ b/apps/remix-ide/src/app/tabs/settings-tab.tsx
@@ -63,6 +63,7 @@ module.exports = class SettingsTab extends ViewPlugin {
   updateComponent(state: any) {
     return (
       <RemixUiSettings
+        plugin={this}
         config={state.config}
         editor={state.editor}
         _deps={state._deps}
diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
index 136e53ff42..47c7fa9b91 100644
--- a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
+++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css
@@ -284,19 +284,19 @@ template {
     color:#fff
 }
 .h1,h1 {
-    font-size:4rem
+    font-size:3rem
 }
 .h2,h2 {
-    font-size:3rem
+    font-size:2.5rem
 }
 .h3,h3 {
-    font-size:2.5rem
+    font-size:2rem
 }
 .h4,h4 {
-    font-size:2rem
+    font-size:1.6rem
 }
 .h5,h5 {
-    font-size:1.5rem
+    font-size:1.3rem
 }
 .h6,h6 {
     font-size:.875rem
diff --git a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
index 3217df2899..b99025172c 100644
--- a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
+++ b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css
@@ -2386,8 +2386,8 @@ fieldset:disabled a.btn {
 
 .btn-secondary {
   color: #fff;
-  background-color: #a8b3bc;
-  border-color: #a8b3bc;
+  background-color: #8b98a3;
+  border-color: #8b98a3;
 }
 .btn-secondary:hover {
   color: #fff;
@@ -2401,8 +2401,8 @@ fieldset:disabled a.btn {
 .btn-secondary.disabled,
 .btn-secondary:disabled {
   color: #fff;
-  background-color: #a8b3bc;
-  border-color: #a8b3bc;
+  background-color: #8b98a3;
+  border-color: #8b98a3;
 }
 .btn-secondary:not(:disabled):not(.disabled):active,
 .btn-secondary:not(:disabled):not(.disabled).active,
@@ -2656,13 +2656,13 @@ fieldset:disabled a.btn {
 }
 
 .btn-outline-secondary {
-  color: #a8b3bc;
-  border-color: #a8b3bc;
+  color: #8b98a3;
+  border-color: #8b98a3;
 }
 .btn-outline-secondary:hover {
   color: #fff;
-  background-color: #a8b3bc;
-  border-color: #a8b3bc;
+  background-color: #8b98a3;
+  border-color: #8b98a3;
 }
 .btn-outline-secondary:focus,
 .btn-outline-secondary.focus {
@@ -2670,15 +2670,15 @@ fieldset:disabled a.btn {
 }
 .btn-outline-secondary.disabled,
 .btn-outline-secondary:disabled {
-  color: #a8b3bc;
+  color: #8b98a3;
   background-color: transparent;
 }
 .btn-outline-secondary:not(:disabled):not(.disabled):active,
 .btn-outline-secondary:not(:disabled):not(.disabled).active,
 .show > .btn-outline-secondary.dropdown-toggle {
   color: #fff;
-  background-color: #a8b3bc;
-  border-color: #a8b3bc;
+  background-color: #8b98a3;
+  border-color: #8b98a3;
 }
 .btn-outline-secondary:not(:disabled):not(.disabled):active:focus,
 .btn-outline-secondary:not(:disabled):not(.disabled).active:focus,
@@ -4731,7 +4731,7 @@ a.badge-primary.focus {
 
 .badge-secondary {
   color: #fff;
-  background-color: #a8b3bc;
+  background-color: #8b98a3;
 }
 a.badge-secondary:hover,
 a.badge-secondary:focus {
@@ -6271,7 +6271,7 @@ button.bg-dark:focus {
 }
 
 .border-secondary {
-  border-color: #a8b3bc !important;
+  border-color: #8b98a3 !important;
 }
 
 .border-success {
@@ -9308,7 +9308,7 @@ a.text-primary:focus {
 }
 
 .text-secondary {
-  color: #a8b3bc !important;
+  color: #8b98a3 !important;
 }
 
 a.text-secondary:hover,
diff --git a/apps/remix-ide/src/assets/img/gnosissafeLogo.png b/apps/remix-ide/src/assets/img/gnosissafeLogo.png
new file mode 100644
index 0000000000..cd0e7ffcb6
Binary files /dev/null and b/apps/remix-ide/src/assets/img/gnosissafeLogo.png differ
diff --git a/apps/remix-ide/src/assets/img/openzeppelinLogo.png b/apps/remix-ide/src/assets/img/openzeppelinLogo.png
new file mode 100644
index 0000000000..6123132cdb
Binary files /dev/null and b/apps/remix-ide/src/assets/img/openzeppelinLogo.png differ
diff --git a/apps/remix-ide/src/assets/img/oxprojectLogo.png b/apps/remix-ide/src/assets/img/oxprojectLogo.png
new file mode 100644
index 0000000000..9b200354ab
Binary files /dev/null and b/apps/remix-ide/src/assets/img/oxprojectLogo.png differ
diff --git a/apps/remix-ide/src/assets/img/remi_drums_whatsnew.webp b/apps/remix-ide/src/assets/img/remi_drums_whatsnew.webp
new file mode 100644
index 0000000000..78b628bd47
Binary files /dev/null and b/apps/remix-ide/src/assets/img/remi_drums_whatsnew.webp differ
diff --git a/apps/remix-ide/src/assets/img/remixverticaltextLogo.png b/apps/remix-ide/src/assets/img/remixverticaltextLogo.png
new file mode 100644
index 0000000000..179807a658
Binary files /dev/null and b/apps/remix-ide/src/assets/img/remixverticaltextLogo.png differ
diff --git a/apps/remix-ide/src/blockchain/blockchain.tsx b/apps/remix-ide/src/blockchain/blockchain.tsx
index 69e9035526..779ea27f0a 100644
--- a/apps/remix-ide/src/blockchain/blockchain.tsx
+++ b/apps/remix-ide/src/blockchain/blockchain.tsx
@@ -23,7 +23,7 @@ const profile = {
   name: 'blockchain',
   displayName: 'Blockchain',
   description: 'Blockchain - Logic',
-  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'getProvider'],
+  methods: ['getCode', 'getTransactionReceipt', 'addProvider', 'removeProvider', 'getCurrentFork', 'getAccounts', 'web3VM', 'web3', 'getProvider'],
   version: packageJson.version
 }
 
diff --git a/apps/remix-ide/src/blockchain/providers/vm.ts b/apps/remix-ide/src/blockchain/providers/vm.ts
index 913bfad2a8..3ae7f6a154 100644
--- a/apps/remix-ide/src/blockchain/providers/vm.ts
+++ b/apps/remix-ide/src/blockchain/providers/vm.ts
@@ -62,6 +62,7 @@ export class VMProvider {
               }
             }
             this.web3 = new Web3(this.provider as LegacySendAsyncProvider)
+            this.web3.setConfig({ defaultTransactionType: '0x0' })
             extend(this.web3)
             this.executionContext.setWeb3(this.executionContext.getProvider(), this.web3)
             resolve({})
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index 6dd9e9428a..411570ebc7 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -76,7 +76,9 @@ let requiredModules = [ // services + layout views + system views
   'contractflattener',
   'solidity-script',
   'openaigpt',
-  'home'
+  'home',
+  'doc-viewer',
+  'doc-gen'
 ]
 
 
diff --git a/apps/remix-ide/src/remixEngine.js b/apps/remix-ide/src/remixEngine.js
index 25860d63de..8622fe5a81 100644
--- a/apps/remix-ide/src/remixEngine.js
+++ b/apps/remix-ide/src/remixEngine.js
@@ -24,6 +24,8 @@ export class RemixEngine extends Engine {
     if (name === 'isogit') return { queueTimeout: 60000 * 4 }
     if (name === 'circuit-compiler') return { queueTimeout: 60000 * 4 }
     if (name === 'compilerloader') return { queueTimeout: 60000 * 4 }
+    if (name === 'filePanel') return { queueTimeout: 60000 * 20 }
+    if (name === 'openaigpt') return { queueTimeout: 60000 * 2 }
     return { queueTimeout: 10000 }
   }
 
diff --git a/apps/remix-ide/src/walkthroughService.js b/apps/remix-ide/src/walkthroughService.js
index d0d466555f..67bb850a8c 100644
--- a/apps/remix-ide/src/walkthroughService.js
+++ b/apps/remix-ide/src/walkthroughService.js
@@ -11,13 +11,21 @@ const profile = {
 }
 
 export class WalkthroughService extends Plugin {
-  constructor (appManager, showMatamo) {
+  constructor (appManager, showWalkthrough) {
     super(profile)
-    appManager.event.on('activate', (plugin) => {
-      if (plugin.name === 'udapp' && !showMatamo) {
+    let readyToStart = 0;
+    /*appManager.event.on('activate', (plugin) => {
+      if (plugin.name === 'udapp') readyToStart++
+      if (readyToStart == 2 && showWalkthrough) {
         this.start()
       }
     })
+    appManager.event.on('activate', (plugin) => {
+      if (plugin.name === 'solidity') readyToStart++
+      if (readyToStart == 2 && showWalkthrough) {
+        this.start()
+      }
+    })*/
   }
 
   start () {
diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index f825171b3c..a673f49419 100644
--- a/libs/ghaction-helper/package.json
+++ b/libs/ghaction-helper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/ghaction-helper",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "description": "Solidity Tests GitHub Action Helper",
   "main": "src/index.js",
   "scripts": {
@@ -19,17 +19,17 @@
   },
   "homepage": "https://github.com/ethereum/remix-project#readme",
   "devDependencies": {
-    "@remix-project/remix-solidity": "^0.5.22",
+    "@remix-project/remix-solidity": "^0.5.23",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.36",
+    "@remix-project/remix-simulator": "^0.2.37",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf"
 }
\ No newline at end of file
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index b6dead62cf..e61b576765 100644
--- a/libs/remix-analyzer/package.json
+++ b/libs/remix-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-analyzer",
-  "version": "0.5.45",
+  "version": "0.5.46",
   "description": "Tool to perform static analysis on Solidity smart contracts",
   "scripts": {
     "test": "./../../node_modules/.bin/ts-node --project ../../tsconfig.base.json --require tsconfig-paths/register ./../../node_modules/.bin/tape ./test/tests.ts"
@@ -25,8 +25,8 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.66",
-    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-astwalker": "^0.0.67",
+    "@remix-project/remix-lib": "^0.5.44",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
     "ethjs-util": "^0.1.6",
@@ -50,6 +50,6 @@
     "typescript": "^3.7.5"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf",
   "main": "./src/index.js"
 }
\ No newline at end of file
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index d83c595abb..a835048c4e 100644
--- a/libs/remix-astwalker/package.json
+++ b/libs/remix-astwalker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-astwalker",
-  "version": "0.0.66",
+  "version": "0.0.67",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-lib": "^0.5.44",
     "@types/tape": "^4.2.33",
     "async": "^2.6.2",
     "ethers": "^5.4.2",
@@ -53,6 +53,6 @@
     "tap-spec": "^5.0.0"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
index c37e3a7dab..698b03c0d3 100644
--- a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
+++ b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
@@ -5,7 +5,7 @@ import { CompilerAbstract } from '@remix-project/remix-solidity'
 
 const profile = {
   name: 'compilerArtefacts',
-  methods: ['get', 'addResolvedContract', 'getCompilerAbstract', 'getAllContractDatas', 'getLastCompilationResult', 'getArtefactsByContractName', 'getContractDataFromAddress', 'getContractDataFromByteCode'],
+  methods: ['get', 'addResolvedContract', 'getCompilerAbstract', 'getAllContractDatas', 'getLastCompilationResult', 'getArtefactsByContractName', 'getContractDataFromAddress', 'getContractDataFromByteCode', 'saveCompilerAbstract'],
   events: [],
   version: '0.0.1'
 }
@@ -24,6 +24,10 @@ export class CompilerArtefacts extends Plugin {
     this.compilersArtefactsPerFile = {}
   }
 
+  saveCompilerAbstract (file: string, compilerAbstract: CompilerAbstract) {
+    this.compilersArtefactsPerFile[file] = compilerAbstract
+  }
+
   onActivation () {
     const saveCompilationPerFileResult = (file, source, languageVersion, data, input?) => {
       this.compilersArtefactsPerFile[file] = new CompilerAbstract(languageVersion, data, source, input)
diff --git a/libs/remix-core-plugin/src/lib/constants/uups.ts b/libs/remix-core-plugin/src/lib/constants/uups.ts
index 3a07dfdc8d..936d6ad440 100644
--- a/libs/remix-core-plugin/src/lib/constants/uups.ts
+++ b/libs/remix-core-plugin/src/lib/constants/uups.ts
@@ -1,16 +1,24 @@
 export const UUPS = 'UUPSUpgradeable'
-// https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.8.0/contracts/proxy/ERC1967/ERC1967Proxy.sol
-// solidity 0.8.7
 export const UUPSBytecode = '608060405260405162000c6638038062000c6683398181016040528101906200002991906200041e565b6200003d828260006200004560201b60201c565b5050620007e2565b62000056836200008860201b60201c565b600082511180620000645750805b156200008357620000818383620000df60201b620000371760201c565b505b505050565b62000099816200011560201b60201c565b8073ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a250565b60606200010d838360405180606001604052806027815260200162000c3f60279139620001eb60201b60201c565b905092915050565b6200012b816200027d60201b620000641760201c565b6200016d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620001649062000587565b60405180910390fd5b80620001a77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b620002a060201b620000871760201c565b60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516200021791906200054a565b600060405180830381855af49150503d806000811462000254576040519150601f19603f3d011682016040523d82523d6000602084013e62000259565b606091505b50915091506200027286838387620002aa60201b60201c565b925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b606083156200031b576000835114156200031257620002cf856200027d60201b60201c565b62000311576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200030890620005a9565b60405180910390fd5b5b8290506200032e565b6200032d83836200033660201b60201c565b5b949350505050565b6000825111156200034a5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000380919062000563565b60405180910390fd5b6000620003a06200039a84620005f4565b620005cb565b905082815260208101848484011115620003bf57620003be62000730565b5b620003cc84828562000690565b509392505050565b600081519050620003e581620007c8565b92915050565b600082601f8301126200040357620004026200072b565b5b81516200041584826020860162000389565b91505092915050565b600080604083850312156200043857620004376200073a565b5b60006200044885828601620003d4565b925050602083015167ffffffffffffffff8111156200046c576200046b62000735565b5b6200047a85828601620003eb565b9150509250929050565b600062000491826200062a565b6200049d818562000640565b9350620004af81856020860162000690565b80840191505092915050565b6000620004c88262000635565b620004d481856200064b565b9350620004e681856020860162000690565b620004f1816200073f565b840191505092915050565b60006200050b602d836200064b565b9150620005188262000750565b604082019050919050565b600062000532601d836200064b565b91506200053f826200079f565b602082019050919050565b600062000558828462000484565b915081905092915050565b600060208201905081810360008301526200057f8184620004bb565b905092915050565b60006020820190508181036000830152620005a281620004fc565b9050919050565b60006020820190508181036000830152620005c48162000523565b9050919050565b6000620005d7620005ea565b9050620005e58282620006c6565b919050565b6000604051905090565b600067ffffffffffffffff821115620006125762000611620006fc565b5b6200061d826200073f565b9050602081019050919050565b600081519050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b6000620006698262000670565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b83811015620006b057808201518184015260208101905062000693565b83811115620006c0576000848401525b50505050565b620006d1826200073f565b810181811067ffffffffffffffff82111715620006f357620006f2620006fc565b5b80604052505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60008201527f6f74206120636f6e747261637400000000000000000000000000000000000000602082015250565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b620007d3816200065c565b8114620007df57600080fd5b50565b61044d80620007f26000396000f3fe6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103f1602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102f8565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b6060831561020857600083511415610200576101c085610064565b6101ff576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f690610331565b60405180910390fd5b5b829050610213565b610212838361021b565b5b949350505050565b60008251111561022e5781518083602001fd5b806040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610262919061030f565b60405180910390fd5b600061027682610351565b6102808185610367565b9350610290818560208601610383565b80840191505092915050565b60006102a78261035c565b6102b18185610372565b93506102c1818560208601610383565b6102ca816103b6565b840191505092915050565b60006102e2601d83610372565b91506102ed826103c7565b602082019050919050565b6000610304828461026b565b915081905092915050565b60006020820190508181036000830152610329818461029c565b905092915050565b6000602082019050818103600083015261034a816102d5565b9050919050565b600081519050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b60005b838110156103a1578082015181840152602081019050610386565b838111156103b0576000848401525b50505050565b6000601f19601f8301169050919050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060008201525056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122055b27d4c39ab82b8890fc1565c3858a1b7f1e0f5780871061f908d7503dcf94e64736f6c63430008070033416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564'
 export const UUPSBytecodeV5 = '60806040526040516106ae3803806106ae833981810160405281019061002591906104f2565b610035828261003c60201b60201c565b50506105ce565b61004b826100c060201b60201c565b8173ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a25f815111156100ad576100a7828261018f60201b60201c565b506100bc565b6100bb61021560201b60201c565b5b5050565b5f8173ffffffffffffffffffffffffffffffffffffffff163b0361011b57806040517f4c9c8ce3000000000000000000000000000000000000000000000000000000008152600401610112919061055b565b60405180910390fd5b8061014d7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5f1b61025160201b60201c565b5f015f6101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60605f808473ffffffffffffffffffffffffffffffffffffffff16846040516101b891906105b8565b5f60405180830381855af49150503d805f81146101f0576040519150601f19603f3d011682016040523d82523d5f602084013e6101f5565b606091505b509150915061020b85838361025a60201b60201c565b9250505092915050565b5f34111561024f576040517fb398979f00000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b565b5f819050919050565b60608261027557610270826102ed60201b60201c565b6102e5565b5f825114801561029b57505f8473ffffffffffffffffffffffffffffffffffffffff163b145b156102dd57836040517f9996b3150000000000000000000000000000000000000000000000000000000081526004016102d4919061055b565b60405180910390fd5b8190506102e6565b5b9392505050565b5f815111156102ff5780518082602001fd5b6040517f1425ea4200000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b5f604051905090565b5f80fd5b5f80fd5b5f73ffffffffffffffffffffffffffffffffffffffff82169050919050565b5f61036b82610342565b9050919050565b61037b81610361565b8114610385575f80fd5b50565b5f8151905061039681610372565b92915050565b5f80fd5b5f80fd5b5f601f19601f8301169050919050565b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b6103ea826103a4565b810181811067ffffffffffffffff82111715610409576104086103b4565b5b80604052505050565b5f61041b610331565b905061042782826103e1565b919050565b5f67ffffffffffffffff821115610446576104456103b4565b5b61044f826103a4565b9050602081019050919050565b5f5b8381101561047957808201518184015260208101905061045e565b5f8484015250505050565b5f6104966104918461042c565b610412565b9050828152602081018484840111156104b2576104b16103a0565b5b6104bd84828561045c565b509392505050565b5f82601f8301126104d9576104d861039c565b5b81516104e9848260208601610484565b91505092915050565b5f80604083850312156105085761050761033a565b5b5f61051585828601610388565b925050602083015167ffffffffffffffff8111156105365761053561033e565b5b610542858286016104c5565b9150509250929050565b61055581610361565b82525050565b5f60208201905061056e5f83018461054c565b92915050565b5f81519050919050565b5f81905092915050565b5f61059282610574565b61059c818561057e565b93506105ac81856020860161045c565b80840191505092915050565b5f6105c38284610588565b915081905092915050565b60d4806105da5f395ff3fe6080604052600a600c565b005b60186014601a565b6026565b565b5f60216044565b905090565b365f80375f80365f845af43d5f803e805f81146040573d5ff35b3d5ffd5b5f606e7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5f1b6095565b5f015f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b5f81905091905056fea26469706673582212202e577dc05daa509bce6e6a86e29397d40b31118aea9fcd0aa88768ad25c610f964736f6c63430008150033'
 export const UUPSDeployedByteCode = '6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103f1602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102f8565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b6060831561020857600083511415610200576101c085610064565b6101ff576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f690610331565b60405180910390fd5b5b829050610213565b610212838361021b565b5b949350505050565b60008251111561022e5781518083602001fd5b806040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610262919061030f565b60405180910390fd5b600061027682610351565b6102808185610367565b9350610290818560208601610383565b80840191505092915050565b60006102a78261035c565b6102b18185610372565b93506102c1818560208601610383565b6102ca816103b6565b840191505092915050565b60006102e2601d83610372565b91506102ed826103c7565b602082019050919050565b6000610304828461026b565b915081905092915050565b60006020820190508181036000830152610329818461029c565b905092915050565b6000602082019050818103600083015261034a816102d5565b9050919050565b600081519050919050565b600081519050919050565b600081905092915050565b600082825260208201905092915050565b60005b838110156103a1578082015181840152602081019050610386565b838111156103b0576000848401525b50505050565b6000601f19601f8301169050919050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060008201525056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122055b27d4c39ab82b8890fc1565c3858a1b7f1e0f5780871061f908d7503dcf94e64736f6c63430008070033'
 export const UUPSDeployedByteCodeV5 = '6080604052600a600c565b005b60186014601a565b6026565b565b5f60216044565b905090565b365f80375f80365f845af43d5f803e805f81146040573d5ff35b3d5ffd5b5f606e7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc5f1b6095565b5f015f9054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b5f81905091905056fea26469706673582212202e577dc05daa509bce6e6a86e29397d40b31118aea9fcd0aa88768ad25c610f964736f6c63430008150033'
+
+// OZ v4.8.0 bytecode compilation config
+export const UUPSProxyContractCode = 'https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.8.0/contracts/proxy/ERC1967/ERC1967Proxy.sol'
 export const UUPSCompilerVersion = 'soljson-v0.8.7+commit.e28d00a7.js'
-export const UUPSCompilerVersionV5 = 'soljson-v0.8.21+commit.d9974bed.js'
 export const UUPSLanguage = 'Solidity'
 export const UUPSOptimize = false
 export const UUPSRuns = 0
 export const UUPSEvmVersion = null
+
+// OZ v5.0.0 bytecode compilation config
+export const UUPSProxyContractCodeV5 = 'https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v5.0.0/contracts/proxy/ERC1967/ERC1967Proxy.sol'
+export const UUPSCompilerVersionV5 = 'soljson-v0.8.21+commit.d9974bed.js'
+export const UUPSLanguagev5 = 'Solidity'
+export const UUPSOptimizev5 = false
+export const UUPSRunsv5 = 0
+export const UUPSEvmVersionv5 = null
 export const UUPSABI = [
   {
     "inputs": [
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index a55aa36b65..7a3f109298 100644
--- a/libs/remix-debug/package.json
+++ b/libs/remix-debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-debug",
-  "version": "0.5.36",
+  "version": "0.5.37",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-astwalker": "^0.0.66",
-    "@remix-project/remix-lib": "^0.5.43",
-    "@remix-project/remix-simulator": "^0.2.36",
-    "@remix-project/remix-solidity": "^0.5.22",
+    "@remix-project/remix-astwalker": "^0.0.67",
+    "@remix-project/remix-lib": "^0.5.44",
+    "@remix-project/remix-simulator": "^0.2.37",
+    "@remix-project/remix-solidity": "^0.5.23",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.2",
     "color-support": "^1.1.3",
@@ -69,6 +69,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-debug#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/src/init.ts b/libs/remix-debug/src/init.ts
index 2cd616226d..28923df9d0 100644
--- a/libs/remix-debug/src/init.ts
+++ b/libs/remix-debug/src/init.ts
@@ -1,5 +1,6 @@
 'use strict'
 import Web3, { Web3PluginBase } from 'web3'
+import {toNumber} from 'web3-utils'
 
 export function extendWeb3 (web3) {
   if(!web3.debug){
@@ -21,11 +22,12 @@ export function setProvider (web3, url) {
 
 export function web3DebugNode (network) {
   const web3DebugNodes = {
-    Main: 'https://eth.getblock.io/68069907-1d3c-466e-a533-a943afd935c6/mainnet',
+    Main: 'https://go.getblock.io/56f8bc5187aa4ac696348f67545acf38',
+    Holesky: 'https://go.getblock.io/7b91c53809fb49c787087e02ef84820b',
     Rinkeby: 'https://remix-rinkeby.ethdevops.io',
     Ropsten: 'https://remix-ropsten.ethdevops.io',
     Goerli: 'https://remix-goerli.ethdevops.io',
-    Sepolia: 'https://remix-sepolia.ethdevops.io'
+    Sepolia: 'https://go.getblock.io/ee42d0a88f314707be11dd799b122cb9'
   }
   if (web3DebugNodes[network]) {
     return loadWeb3(web3DebugNodes[network])
@@ -57,7 +59,7 @@ class Web3DebugPlugin extends Web3PluginBase {
   public storageRangeAt(txBlockHash, txIndex, address, start, maxSize, cb) {
     this.requestManager.send({
       method: 'debug_storageRangeAt',
-      params: [txBlockHash, txIndex, address, start, maxSize]
+      params: [txBlockHash, toNumber(txIndex), address, start, maxSize]
     })
       .then(result => cb(null, result))
       .catch(error => cb(error))
diff --git a/libs/remix-debug/test/vmCall.ts b/libs/remix-debug/test/vmCall.ts
index b00a506983..e9d6e28012 100644
--- a/libs/remix-debug/test/vmCall.ts
+++ b/libs/remix-debug/test/vmCall.ts
@@ -23,7 +23,7 @@ async function sendTx (web3, from, to, value, data, cb) {
       value,
       data,
       gas: 7000000
-    })
+    }, null, { checkRevertBeforeSending: false, ignoreGasPricing: true })
     cb(null, receipt.transactionHash)
     return receipt.transactionHash
   } catch (e) {
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 21c6d9a646..74e48fc07c 100644
--- a/libs/remix-lib/package.json
+++ b/libs/remix-lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-lib",
-  "version": "0.5.43",
+  "version": "0.5.44",
   "description": "Library to various Remix tools",
   "contributors": [
     {
@@ -55,6 +55,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-lib#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-lib/src/execution/txExecution.ts b/libs/remix-lib/src/execution/txExecution.ts
index e7eb879c74..3682d6c1db 100644
--- a/libs/remix-lib/src/execution/txExecution.ts
+++ b/libs/remix-lib/src/execution/txExecution.ts
@@ -89,7 +89,7 @@ export function checkError (execResult, compiledContracts) {
     msg = '\tThe transaction ran out of gas. Please increase the Gas Limit.\n'
     ret.error = true
   } else if (exceptionError === errorCode.REVERT || exceptionError === 'execution reverted') {
-    const returnData = execResult.errorData
+    const returnData = execResult.errorData || '0x00000000'
     const returnDataHex = returnData.slice(2, 10)
     let customError
     if (compiledContracts) {
diff --git a/libs/remix-lib/src/execution/txRunnerVM.ts b/libs/remix-lib/src/execution/txRunnerVM.ts
index c71f8778a0..7604bee0b2 100644
--- a/libs/remix-lib/src/execution/txRunnerVM.ts
+++ b/libs/remix-lib/src/execution/txRunnerVM.ts
@@ -31,13 +31,13 @@ export class TxRunnerVM {
   nextNonceForCall: number
   getVMObject: () => any
 
-  constructor (vmaccounts, api, getVMObject) {
+  constructor (vmaccounts, api, getVMObject, blockNumber) {
     this.event = new EventManager()
     this.logsManager = new LogsManager()
     // has a default for now for backwards compatibility
     this.getVMObject = getVMObject
     this.commonContext = this.getVMObject().common
-    this.blockNumber = 0
+    this.blockNumber = blockNumber || 0
     this.pendingTxs = {}
     this.vmaccounts = vmaccounts
     this.queusTxs = []
diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index a7f1cce7ac..02d343b475 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -65,7 +65,7 @@ export class TxRunnerWeb3 {
       promptCb(
         async (value) => {
           try {
-            const res = await (this.getWeb3() as any).eth.personal.sendTransaction({...tx, value})
+            const res = await (this.getWeb3() as any).eth.personal.sendTransaction({...tx, value}, { checkRevertBeforeSending: false, ignoreGasPricing: true })
             cb(null, res.transactionHash)
           } catch (e)  {
             console.log(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `)
@@ -81,7 +81,7 @@ export class TxRunnerWeb3 {
       )
     } else {
       try {
-        const res = await this.getWeb3().eth.sendTransaction(tx, null, { checkRevertBeforeSending: false })
+        const res = await this.getWeb3().eth.sendTransaction(tx, null, { checkRevertBeforeSending: false, ignoreGasPricing: true})
         cb(null, res.transactionHash)
       } catch (e)  {
         console.log(`Send transaction failed: ${e.message} . if you use an injected provider, please check it is properly unlocked. `)
diff --git a/libs/remix-lib/src/execution/typeConversion.ts b/libs/remix-lib/src/execution/typeConversion.ts
index 5d7bf97084..c05e9873ec 100644
--- a/libs/remix-lib/src/execution/typeConversion.ts
+++ b/libs/remix-lib/src/execution/typeConversion.ts
@@ -24,6 +24,8 @@ function convertToString (v) {
       return ret
     } else if (BN.isBN(v) || (v.constructor && v.constructor.name === 'BigNumber') || isBigInt(v)) {
       return v.toString(10)
+    } else if (v._isBigNumber) {
+      return toInt(v._hex)
     } else if (v._isBuffer) {
       return bufferToHex(v)
     } else if (typeof v === 'object') {
diff --git a/libs/remix-lib/src/init.ts b/libs/remix-lib/src/init.ts
index c3e30f269d..511534b3f8 100644
--- a/libs/remix-lib/src/init.ts
+++ b/libs/remix-lib/src/init.ts
@@ -1,5 +1,6 @@
 'use strict'
 import Web3, { Web3PluginBase } from 'web3'
+import {toNumber} from 'web3-utils'
 
 export function extendWeb3 (web3) {
   if(!web3.debug){
@@ -38,7 +39,7 @@ class Web3DebugPlugin extends Web3PluginBase {
   public storageRangeAt(txBlockHash, txIndex, address, start, maxSize, cb) {
     this.requestManager.send({
       method: 'debug_storageRangeAt',
-      params: [txBlockHash, txIndex, address, start, maxSize]
+      params: [txBlockHash, toNumber(txIndex), address, start, maxSize]
     })
       .then(result => cb(null, result))
       .catch(error => cb(error))
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index 61e85c53e0..c9abd30319 100644
--- a/libs/remix-simulator/package.json
+++ b/libs/remix-simulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-simulator",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -22,7 +22,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-lib": "^0.5.44",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -37,6 +37,7 @@
     "rlp": "^3.0.0",
     "string-similarity": "^4.0.4",
     "time-stamp": "^2.0.0",
+    "tslib": "^2.3.0",
     "web3": "^4.1.1",
     "web3-utils": "^4.0.5"
   },
@@ -69,6 +70,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1",
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index 088ad3bf8f..6018f9fc99 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -32,7 +32,7 @@ export class Transactions {
     this.tags = {}
   }
 
-  init (accounts) {
+  init (accounts, blockNumber) {
     this.accounts = accounts
     const api = {
       logMessage: (msg) => {
@@ -55,7 +55,7 @@ export class Transactions {
       }
     }
 
-    this.txRunnerVMInstance = new TxRunnerVM(accounts, api, _ => this.vmContext.vmObject())
+    this.txRunnerVMInstance = new TxRunnerVM(accounts, api, _ => this.vmContext.vmObject(), blockNumber)
     this.txRunnerInstance = new TxRunner(this.txRunnerVMInstance, {})
     this.txRunnerInstance.vmaccounts = accounts
   }
@@ -158,10 +158,7 @@ export class Transactions {
     this.vmContext.web3().flagNextAsDoNotRecordEvmSteps()
     processTx(this.txRunnerInstance, payload, true, (error, value: VMexecutionResult) => {
       if (error) return cb(error)
-      const result: any = value.result
-      if (result.execResult && result.execResult.exceptionError && result.execResult.exceptionError.errorType === 'EvmError') {
-        return cb(result.execResult.exceptionError.error)
-      }
+      const result: any = value.result      
       if ((result as any).receipt?.status === '0x0' || (result as any).receipt?.status === 0) {
         try {
           const msg = `0x${result.execResult.returnValue.toString('hex') || '0'}`
@@ -172,6 +169,9 @@ export class Transactions {
           return cb(e.message)
         }
       }
+      if (result.execResult && result.execResult.exceptionError && result.execResult.exceptionError.errorType === 'EvmError') {
+        return cb(result.execResult.exceptionError.error)
+      }
       let gasUsed = Number(toNumber(result.execResult.executionGasUsed))
       if (result.execResult.gasRefund) {
         gasUsed += Number(toNumber(result.execResult.gasRefund))
diff --git a/libs/remix-simulator/src/provider.ts b/libs/remix-simulator/src/provider.ts
index 2d2da213f1..59066c0ab6 100644
--- a/libs/remix-simulator/src/provider.ts
+++ b/libs/remix-simulator/src/provider.ts
@@ -60,7 +60,7 @@ export class Provider {
     this.pendingRequests = []
     await this.vmContext.init()
     await this.Accounts.resetAccounts()
-    this.Transactions.init(this.Accounts.accounts)
+    this.Transactions.init(this.Accounts.accounts, this.vmContext.blockNumber)
     this.initialized = true
     if (this.pendingRequests.length > 0) {
       this.pendingRequests.map((req) => {
diff --git a/libs/remix-simulator/src/vm-context.ts b/libs/remix-simulator/src/vm-context.ts
index 09665db83d..605a3bf971 100644
--- a/libs/remix-simulator/src/vm-context.ts
+++ b/libs/remix-simulator/src/vm-context.ts
@@ -313,6 +313,7 @@ export class VMContext {
           provider: this.nodeUrl,
           blockTag: '0x' + block.toString(16)
         })
+        this.blockNumber = block
       } else {
         stateManager = new CustomEthersStateManager({
           provider: this.nodeUrl,
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index 8de07033de..c4cf19f8ec 100644
--- a/libs/remix-solidity/package.json
+++ b/libs/remix-solidity/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-solidity",
-  "version": "0.5.22",
+  "version": "0.5.23",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.43",
+    "@remix-project/remix-lib": "^0.5.44",
     "async": "^2.6.2",
     "eslint-scope": "^5.0.0",
     "ethers": "^5.4.2",
@@ -57,5 +57,5 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-solidity#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf"
 }
\ No newline at end of file
diff --git a/libs/remix-solidity/src/compiler/compiler-input.ts b/libs/remix-solidity/src/compiler/compiler-input.ts
index 8598c9dfd4..61c8ece472 100644
--- a/libs/remix-solidity/src/compiler/compiler-input.ts
+++ b/libs/remix-solidity/src/compiler/compiler-input.ts
@@ -17,7 +17,8 @@ export default (sources: Source, opts: CompilerInputOptions): string => {
           '': ['ast'],
           '*': ['abi', 'metadata', 'devdoc', 'userdoc', 'storageLayout', 'evm.legacyAssembly', 'evm.bytecode', 'evm.deployedBytecode', 'evm.methodIdentifiers', 'evm.gasEstimates', 'evm.assembly']
         }
-      }
+      },
+      remappings: opts.remappings || []
     }
   }  
   if (opts.evmVersion) {
diff --git a/libs/remix-solidity/src/compiler/compiler.ts b/libs/remix-solidity/src/compiler/compiler.ts
index 2e20b0c857..a99154c08a 100644
--- a/libs/remix-solidity/src/compiler/compiler.ts
+++ b/libs/remix-solidity/src/compiler/compiler.ts
@@ -32,6 +32,7 @@ export class Compiler {
       runs: 200,
       evmVersion: null,
       language: 'Solidity',
+      remappings: [],
       compilationStartTime: null,
       target: null,
       useFileConfiguration: false,
@@ -213,12 +214,11 @@ export class Compiler {
           let input = ""
           try {
             if (source && source.sources) {
-              const { optimize, runs, evmVersion, language, useFileConfiguration, configFileContent } = this.state
-
+              const { optimize, runs, evmVersion, language, remappings, useFileConfiguration, configFileContent } = this.state
               if (useFileConfiguration) {
                 input = compilerInputForConfigFile(source.sources, JSON.parse(configFileContent))
               } else {
-                input = compilerInput(source.sources, { optimize, runs, evmVersion, language })
+                input = compilerInput(source.sources, { optimize, runs, evmVersion, language, remappings })
               }
 
               result = JSON.parse(remoteCompiler.compile(input, { import: missingInputsCallback }))
@@ -331,15 +331,18 @@ export class Compiler {
 
     this.state.compileJSON = (source: SourceWithTarget, timeStamp: number) => {
       if (source && source.sources) {
-        const { optimize, runs, evmVersion, language, useFileConfiguration, configFileContent } = this.state
+        const { optimize, runs, evmVersion, language, remappings, useFileConfiguration, configFileContent } = this.state
         jobs.push({ sources: source })
         let input = ""
 
         try {
           if (useFileConfiguration) {
-            input = compilerInputForConfigFile(source.sources, JSON.parse(configFileContent))
+            const compilerInput = JSON.parse(configFileContent)
+            if (compilerInput.settings.remappings?.length) compilerInput.settings.remappings.push(...remappings)
+            else compilerInput.settings.remappings = remappings
+            input = compilerInputForConfigFile(source.sources, compilerInput)
           } else {
-            input = compilerInput(source.sources, { optimize, runs, evmVersion, language })
+            input = compilerInput(source.sources, { optimize, runs, evmVersion, language, remappings })
           }
         } catch (exception) {
           this.onCompilationFinished({ error: { formattedMessage: exception.message } }, [], source, "", this.state.currentVersion)
diff --git a/libs/remix-solidity/src/compiler/types.ts b/libs/remix-solidity/src/compiler/types.ts
index d86e7b0b74..6a6a74e7ce 100644
--- a/libs/remix-solidity/src/compiler/types.ts
+++ b/libs/remix-solidity/src/compiler/types.ts
@@ -147,7 +147,8 @@ export interface CompilerInputOptions {
         [fileName: string]: Record<string, string>
     },
     evmVersion?: EVMVersion,
-    language?: Language
+    language?: Language,
+    remappings?: string[]
 }
 
 export type EVMVersion = 'homestead' | 'tangerineWhistle' | 'spuriousDragon' | 'byzantium' | 'constantinople' | 'petersburg' | 'istanbul' | 'berlin' | 'london' | 'paris' | null
@@ -168,6 +169,7 @@ export interface CompilerState {
     runs: number
     evmVersion: EVMVersion| null,
     language: Language,
+    remappings: string[]
     compilationStartTime: number| null,
     target: string | null,
     useFileConfiguration: boolean,
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index cd76e6f5a7..242ec5ecb2 100644
--- a/libs/remix-tests/package.json
+++ b/libs/remix-tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-tests",
-  "version": "0.2.36",
+  "version": "0.2.37",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "^4.1.1",
     "@ethereumjs/util": "^8.0.5",
     "@ethereumjs/vm": "^6.4.1",
-    "@remix-project/remix-lib": "^0.5.43",
-    "@remix-project/remix-simulator": "^0.2.36",
-    "@remix-project/remix-solidity": "^0.5.22",
+    "@remix-project/remix-lib": "^0.5.44",
+    "@remix-project/remix-simulator": "^0.2.37",
+    "@remix-project/remix-solidity": "^0.5.23",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -78,5 +78,5 @@
     "typescript": "^3.3.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf"
 }
\ No newline at end of file
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx b/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx
new file mode 100644
index 0000000000..b13cd5adc2
--- /dev/null
+++ b/libs/remix-ui/app/src/lib/remix-app/components/modals/enter.tsx
@@ -0,0 +1,60 @@
+import React, {useContext, useEffect, useState} from 'react'
+import {AppContext} from '../../context/context'
+import {UsageTypes} from '../../types'
+import { type } from 'os'
+
+interface EnterDialogProps {
+  hide: boolean,
+  handleUserChoice: (userChoice: UsageTypes) => void,
+}
+
+const EnterDialog = (props: EnterDialogProps) => {
+  const [visibility, setVisibility] = useState<boolean>(false)
+  const {showEnter} = useContext(AppContext)
+
+  useEffect(() => {
+    setVisibility(!props.hide)
+  }, [props.hide])
+
+  const enterAs = async (uType) => {
+    props.handleUserChoice(uType)
+  }
+
+  const modalClass = (visibility && showEnter) ? "d-flex" : "d-none"
+  return (
+    <div
+      data-id={`EnterModalDialogContainer-react`}
+      data-backdrop="static"
+      data-keyboard="false"
+      className={"modal  " + modalClass}
+      role="dialog"
+    >
+      <div className="modal-dialog align-self-center pb-4" role="document">
+        <div
+          tabIndex={-1}
+          className={'modal-content remixModalContent mb-4'}
+          onKeyDown={({keyCode}) => {
+          }}
+        >
+          <div className="modal-header d-flex flex-column">
+            <h3 className='text-dark'>Welcome to Remix IDE</h3>
+            <div className='d-flex flex-row pt-2'>
+              <h6 className="modal-title" data-id={`EnterModalDialogModalTitle-react`}>
+                To load the project with the most efficient setup we would like to know your experience type.
+              </h6>
+              <i className="text-dark fal fa-door-open text-center" style={{minWidth: "100px", fontSize: "xxx-large"}}></i>
+            </div>
+          </div>
+          <div className="modal-body text-break remixModalBody d-flex flex-row p-3 justify-content-between" data-id={`EnterModalDialogModalBody-react`}>
+            <button className="btn-secondary" data-id="beginnerbtn" style={{minWidth: "100px"}} onClick={() => {enterAs(UsageTypes.Beginner)}}>Beginner</button>
+            <button className="btn-secondary" data-id="tutorbtn" style={{minWidth: "100px"}} onClick={() => {enterAs(UsageTypes.Tutor)}}>Teacher</button>
+            <button className="btn-secondary" data-id="prototyperbtn" style={{minWidth: "100px"}} onClick={() => {enterAs(UsageTypes.Prototyper)}}>Prototyper</button>
+            <button className="btn-secondary" data-id="productionbtn" style={{minWidth: "100px"}} onClick={() => {enterAs(UsageTypes.Production)}}>Production User</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default EnterDialog
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx b/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
index 86777b5a6c..c4637cb85d 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/modals/matomo.tsx
@@ -25,11 +25,7 @@ const MatomoDialog = (props) => {
         </p>
         <p>We realize that our users have sensitive information in their code and that their privacy - your privacy - must be protected.</p>
         <p>
-          All data collected through Matomo is stored on our own server - no data is ever given to third parties. Our analytics reports are public:{' '}
-          <a href="https://matomo.ethereum.org/index.php?module=MultiSites&action=index&idSite=23&period=day&date=yesterday" target="_blank" rel="noreferrer">
-            take a look
-          </a>
-          .
+          All data collected through Matomo is stored on our own server - no data is ever given to third parties.
         </p>
         <p>We do not collect nor store any personally identifiable information (PII).</p>
         <p>
@@ -61,16 +57,12 @@ const MatomoDialog = (props) => {
   const declineModal = async () => {
     settings.updateMatomoAnalyticsChoice(false)
     _paq.push(['optUserOut'])
-    appManager.call('walkthrough', 'start')
     setVisible(false)
   }
 
   const handleModalOkClick = async () => {
     _paq.push(['forgetUserOptOut'])
-    // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
-    document.cookie = 'mtm_consent_removed=; expires=Thu, 01 Jan 1970 00:00:01 GMT;'
     settings.updateMatomoAnalyticsChoice(true)
-    appManager.call('walkthrough', 'start')
     setVisible(false)
   }
 
diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index 3ab21c7cc4..eb298090ea 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -15,7 +15,7 @@ export interface AppModal {
     message: string | JSX.Element
     okLabel: string | JSX.Element
     okFn?: (value?:any) => void
-    cancelLabel: string | JSX.Element
+    cancelLabel?: string | JSX.Element
     cancelFn?: () => void,
     modalType?: ModalTypes,
     defaultValue?: string
@@ -37,3 +37,10 @@ export interface ModalState {
     focusModal: AppModal,
     focusToaster:  {message: (string | JSX.Element), timestamp: number }
 }
+
+export interface forceChoiceModal {
+  id: string
+  title?: string,
+  message: string | JSX.Element,
+}
+
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 29fb16c620..974cc015ee 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -2,6 +2,7 @@ import React, {useEffect, useRef, useState} from 'react'
 import './style/remix-app.css'
 import {RemixUIMainPanel} from '@remix-ui/panel'
 import MatomoDialog from './components/modals/matomo'
+import EnterDialog from './components/modals/enter'
 import OriginWarning from './components/modals/origin-warning'
 import DragBar from './components/dragbar/dragbar'
 import {AppProvider} from './context/provider'
@@ -9,13 +10,22 @@ import AppDialogs from './components/modals/dialogs'
 import DialogViewPlugin from './components/modals/dialogViewPlugin'
 import { AppContext, appProviderContextType } from './context/context'
 import { FormattedMessage, IntlProvider } from 'react-intl'
-import { CustomTooltip } from '@remix-ui/helper';
+import {CustomTooltip} from '@remix-ui/helper'
+import {UsageTypes} from './types'
+
+declare global {
+  interface Window {
+    _paq: any
+  }
+}
+const _paq = (window._paq = window._paq || [])
 
 interface IRemixAppUi {
   app: any
 }
 const RemixApp = (props: IRemixAppUi) => {
   const [appReady, setAppReady] = useState<boolean>(false)
+  const [showEnterDialog, setShowEnterDialog] = useState<boolean>(true)
   const [hideSidePanel, setHideSidePanel] = useState<boolean>(false)
   const [maximiseTrigger, setMaximiseTrigger] = useState<number>(0)
   const [resetTrigger, setResetTrigger] = useState<number>(0)
@@ -39,6 +49,8 @@ const RemixApp = (props: IRemixAppUi) => {
       console.log('app activate', new Date().toLocaleString())
       activateApp()
     }
+    const hadUsageTypeAsked = localStorage.getItem('hadUsageTypeAsked')
+    setShowEnterDialog(!hadUsageTypeAsked)
   }, [])
 
   function setListeners() {
@@ -81,6 +93,7 @@ const RemixApp = (props: IRemixAppUi) => {
   const value: appProviderContextType = {
     settings: props.app.settings,
     showMatamo: props.app.showMatamo,
+    showEnter: props.app.showEnter,
     appManager: props.app.appManager,
     modal: props.app.notification,
     layout: props.app.layout,
@@ -88,17 +101,60 @@ const RemixApp = (props: IRemixAppUi) => {
     online: online
   }
 
+  const handleUserChosenType = async (type) => {
+    setShowEnterDialog(false)
+    localStorage.setItem('hadUsageTypeAsked', type)
+
+    await props.app.appManager.call('walkthrough', 'start')
+
+    // Use the type to setup the UI accordingly
+    switch (type) {
+    case UsageTypes.Beginner: {
+      await props.app.appManager.call('manager', 'activatePlugin', 'LearnEth')
+      // const wName = 'Playground'
+      // const workspaces = await props.app.appManager.call('filePanel', 'getWorkspaces')
+      // if (!workspaces.find((workspace) => workspace.name === wName)) {
+      //   await props.app.appManager.call('filePanel', 'createWorkspace', wName, 'playground')
+      // }
+      // await props.app.appManager.call('filePanel', 'switchToWorkspace', { name: wName, isLocalHost: false })
+
+      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'beginner'])
+      break
+    }
+    case UsageTypes.Tutor: {
+      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'tutor'])
+      break
+    }
+    case UsageTypes.Prototyper: {
+      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'prototyper'])
+      break
+    }
+    case UsageTypes.Production: {
+      _paq.push(['trackEvent', 'enterDialog', 'usageType', 'production'])
+      break
+    }
+    default: throw new Error()
+    }
+
+  }
+
   return (
     //@ts-ignore
     <IntlProvider locale={locale.code} messages={locale.messages}>
       <AppProvider value={value}>
         <OriginWarning></OriginWarning>
-        <MatomoDialog hide={!appReady}></MatomoDialog>
+        <MatomoDialog hide={!appReady} okFn={() => {setShowEnterDialog(true)}}></MatomoDialog>
+        <EnterDialog hide={!showEnterDialog} handleUserChoice={(type) => handleUserChosenType(type)}></EnterDialog>
         <div className={`remixIDE ${appReady ? '' : 'd-none'}`} data-id="remixIDE">
           <div id="icon-panel" data-id="remixIdeIconPanel" className="custom_icon_panel iconpanel bg-light">
             {props.app.menuicons.render()}
           </div>
-          <div ref={sidePanelRef} id="side-panel" data-id="remixIdeSidePanel" className={`sidepanel border-right border-left ${hideSidePanel ? 'd-none' : ''}`}>
+          <div
+            ref={sidePanelRef}
+            id="side-panel"
+            data-id="remixIdeSidePanel"
+            className={`sidepanel border-right border-left ${hideSidePanel ? 'd-none' : ''}`}
+          >
             {props.app.sidePanel.render()}
           </div>
           <DragBar
diff --git a/libs/remix-ui/app/src/lib/remix-app/types/index.ts b/libs/remix-ui/app/src/lib/remix-app/types/index.ts
index 6822dbe73e..0037fd6cb8 100644
--- a/libs/remix-ui/app/src/lib/remix-app/types/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/types/index.ts
@@ -1,8 +1,16 @@
 export const enum ModalTypes {
-    alert = 'alert',
-    confirm = 'confirm',
-    prompt = 'prompt',
-    password = 'password',
-    default = 'default',
-    form = 'form',
+  alert = 'alert',
+  confirm = 'confirm',
+  prompt = 'prompt',
+  password = 'password',
+  default = 'default',
+  form = 'form',
+  forceChoice = 'forceChoice'
 }
+
+export const enum UsageTypes {
+  Beginner = 1,
+  Tutor,
+  Prototyper,
+  Production,
+}
\ No newline at end of file
diff --git a/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts b/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts
new file mode 100644
index 0000000000..56a3c9c61a
--- /dev/null
+++ b/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts
@@ -0,0 +1,102 @@
+/* eslint-disable no-control-regex */
+import { EditorUIProps, monacoTypes } from '@remix-ui/editor';
+import axios, {AxiosResponse} from 'axios'
+const controller = new AbortController();
+const { signal } = controller;
+const result: string = ''
+
+export class RemixInLineCompletionProvider implements monacoTypes.languages.InlineCompletionsProvider {
+  props: EditorUIProps
+  monaco: any
+  constructor(props: any, monaco: any) {
+    this.props = props
+    this.monaco = monaco
+  }
+
+  async provideInlineCompletions(model: monacoTypes.editor.ITextModel, position: monacoTypes.Position, context: monacoTypes.languages.InlineCompletionContext, token: monacoTypes.CancellationToken): Promise<monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>> {
+    if (context.selectedSuggestionInfo) {
+      return;
+    }
+    // get text before the position of the completion
+    const word = model.getValueInRange({
+      startLineNumber: 1,
+      startColumn: 1,
+      endLineNumber: position.lineNumber,
+      endColumn: position.column,
+    });
+
+    if (!word.endsWith(' ') && !word.endsWith('\n') && !word.endsWith(';') && !word.endsWith('.')) {
+      return;
+    }
+
+    try {
+      const isActivate = await this.props.plugin.call('copilot-suggestion', 'isActivate')
+      if (!isActivate) return
+    } catch (err) {
+      return;
+    }
+
+    try {
+      const split = word.split('\n')
+      if (split.length < 2) return
+      const ask = split[split.length - 2].trimStart()
+      if (split[split.length - 1].trim() === '' && ask.startsWith('///')) {
+        // use the code generation model
+        const {data} = await axios.post('https://gpt-chat.remixproject.org/infer', {comment: ask.replace('///', '')})
+        const parsedData = JSON.parse(data).trimStart()
+        const item: monacoTypes.languages.InlineCompletion = {
+          insertText: parsedData
+        };
+        return {
+          items: [item],
+          enableForwardStability: true
+        }
+      }
+    } catch (e) {
+      console.error(e)
+    }   
+    
+    // abort if there is a signal
+    if (token.isCancellationRequested) {
+      return
+    }
+
+    let result
+    try {
+      result = await this.props.plugin.call('copilot-suggestion', 'suggest', word)
+    } catch (err) {
+      return
+    }
+
+    const generatedText = (result as any).output[0].generated_text as string
+    // the generated text remove a space from the context...
+    const clean = generatedText.replace('@custom:dev-run-script', '@custom:dev-run-script ').replace(word, '')
+    const item: monacoTypes.languages.InlineCompletion = {
+      insertText: clean
+    };
+
+    // abort if there is a signal
+    if (token.isCancellationRequested) {
+      return
+    }
+    return {
+      items: [item],
+      enableForwardStability: true
+    }
+
+  }
+  handleItemDidShow?(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>, item: monacoTypes.languages.InlineCompletion, updatedInsertText: string): void {
+
+  }
+  handlePartialAccept?(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>, item: monacoTypes.languages.InlineCompletion, acceptedCharacters: number): void {
+
+  }
+  freeInlineCompletions(completions: monacoTypes.languages.InlineCompletions<monacoTypes.languages.InlineCompletion>): void {
+
+  }
+  groupId?: string;
+  yieldsToGroupIds?: string[];
+  toString?(): string {
+    throw new Error('Method not implemented.');
+  }
+}
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
index 652e6b3992..f53567cb79 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -19,6 +19,8 @@ import { RemixCodeActionProvider } from './providers/codeActionProvider'
 import './remix-ui-editor.css'
 import { circomLanguageConfig, circomTokensProvider } from './syntaxes/circom'
 import { IPosition } from 'monaco-editor'
+import { RemixInLineCompletionProvider } from './providers/inlineCompletionProvider'
+const _paq = (window._paq = window._paq || [])
 
 enum MarkerSeverity {
   Hint = 1,
@@ -708,6 +710,7 @@ export const EditorUI = (props: EditorUIProps) => {
         Generate the documentation for the function ${currentFunction.current} using the Doxygen style syntax
         `
         await props.plugin.call('openaigpt', 'message', message)
+        _paq.push(['trackEvent', 'ai', 'openai', 'generateDocumentation'])
       },
     }
 
@@ -726,6 +729,7 @@ export const EditorUI = (props: EditorUIProps) => {
         Explain the function ${currentFunction.current}
         `
         await props.plugin.call('openaigpt', 'message', message)
+        _paq.push(['trackEvent', 'ai', 'openai', 'explainFunction'])
       },
     }
 
@@ -733,7 +737,7 @@ export const EditorUI = (props: EditorUIProps) => {
     let freeFunctionAction
     const executeFreeFunctionAction = {
       id: 'executeFreeFunction',
-      label: 'Run a free function in the Remix VM',
+      label: 'Run a free function',
       contextMenuOrder: 0, // choose the order
       contextMenuGroupId: 'execute', // create a new grouping
       precondition: 'freeFunctionCondition',
@@ -791,7 +795,7 @@ export const EditorUI = (props: EditorUIProps) => {
       const { nodesAtPosition } = await retrieveNodesAtPosition(props.editorAPI, props.plugin)
       const freeFunctionNode = nodesAtPosition.find((node) => node.kind === 'freeFunction')
       if (freeFunctionNode) {
-        executeFreeFunctionAction.label = `Run the free function "${freeFunctionNode.name}" in the Remix VM`
+        executeFreeFunctionAction.label = `Run the free function "${freeFunctionNode.name}"`
         freeFunctionAction = editor.addAction(executeFreeFunctionAction)
       }
       const functionImpl = nodesAtPosition.find((node) => node.kind === 'function')
@@ -867,6 +871,7 @@ export const EditorUI = (props: EditorUIProps) => {
     monacoRef.current.languages.registerReferenceProvider('remix-solidity', new RemixReferenceProvider(props, monaco))
     monacoRef.current.languages.registerHoverProvider('remix-solidity', new RemixHoverProvider(props, monaco))
     monacoRef.current.languages.registerCompletionItemProvider('remix-solidity', new RemixCompletionProvider(props, monaco))
+    monacoRef.current.languages.registerInlineCompletionsProvider('remix-solidity', new RemixInLineCompletionProvider(props, monaco))
     monaco.languages.registerCodeActionProvider('remix-solidity', new RemixCodeActionProvider(props, monaco))
 
     loadTypes(monacoRef.current)
@@ -883,6 +888,9 @@ export const EditorUI = (props: EditorUIProps) => {
         options={{
           glyphMargin: true,
           readOnly: (!editorRef.current || !props.currentFile) && editorModelsState[props.currentFile]?.readOnly,
+          inlineSuggest: {
+            enabled: true,
+          }
         }}
         defaultValue={defaultEditorValue}
       />
diff --git a/libs/remix-ui/editor/src/lib/web-types.ts b/libs/remix-ui/editor/src/lib/web-types.ts
index 9d95f1440e..ae8253f65f 100644
--- a/libs/remix-ui/editor/src/lib/web-types.ts
+++ b/libs/remix-ui/editor/src/lib/web-types.ts
@@ -215,6 +215,7 @@ export const loadTypes = async (monaco) => {
     declare global {
         const remix: PluginClient;
         const web3Provider;
+        const require;
     }
     `
   monaco.languages.typescript.typescriptDefaults.addExtraLib(indexRemixApi)
@@ -230,4 +231,4 @@ export const loadTypes = async (monaco) => {
   const loadedElement = document.createElement('span')
   loadedElement.setAttribute('data-id', 'typesloaded')
   document.body.appendChild(loadedElement)
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
index 29aa86aad4..d24ee0fb93 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
@@ -40,6 +40,32 @@ function HomeTabFeatured() {
               autoPlaySpeed={15000}
               dotListClass="position-relative mt-2"
             >
+              <div className="mx-1 px-1 d-flex">
+                <a href="https://medium.com/remix-ide/remix-release-v0-38-0-dccd551b6f1e" target="__blank">
+                  <img src={'assets/img/remi_drums_whatsnew.webp'} style={{flex: '1', height: '170px', maxWidth: '170px'}} alt=""></img>
+                </a>
+                <div className="h6 w-50 p-2 pl-4 align-self-center" style={{flex: '1'}}>
+                  <h5>
+                    <FormattedMessage id="homeReleaseDetails.title" />
+                  </h5>
+                  <div style={{fontSize: '0.8rem'}} className="mb-3">
+                    <ul>
+                      <li style={{padding: '0.15rem'}}><FormattedMessage id="homeReleaseDetails.highlight1" /></li>
+                      <li style={{padding: '0.15rem'}}><FormattedMessage id="homeReleaseDetails.highlight2" /></li>
+                      <li style={{padding: '0.15rem'}}><FormattedMessage id="homeReleaseDetails.highlight3" /></li>
+                      <li style={{padding: '0.15rem'}}><FormattedMessage id="homeReleaseDetails.highlight4" /></li>
+                    </ul>
+                  </div>
+                  <a
+                    className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
+                    onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'seeFullChangelog'])}
+                    target="__blank"
+                    href="https://medium.com/remix-ide/remix-release-v0-38-0-dccd551b6f1e"
+                  >
+                    <FormattedMessage id="homeReleaseDetails.more" />
+                  </a>
+                </div>
+              </div>
               <div className="mx-1 px-1 d-flex">
                 <a href="https://remix-project.org" target="__blank">
                   <img src={'assets/img/bgRemi_small.webp'} style={{flex: '1', height: '170px', maxWidth: '170px'}} alt=""></img>
@@ -48,14 +74,14 @@ function HomeTabFeatured() {
                   <h5>
                     <FormattedMessage id="home.jumpIntoWeb3" />
                   </h5>
-                  <div style={{fontSize: '0.8rem'}} className="mb-3">
+                  <div style={{fontSize: '0.8rem', lineHeight: '1.25rem'}} className="mb-3">
                     <FormattedMessage id="home.jumpIntoWeb3Text" />
                   </div>
                   <a
                     className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
                     onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'jumpIntoWeb3'])}
                     target="__blank"
-                    href="https://us8.list-manage.com/survey?u=5a84beb6d688fe180c0da482a&id=1148d10f8c"
+                    href="https://remix-project.org/"
                   >
                     <FormattedMessage id="home.jumpIntoWeb3More" />
                   </a>
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
index b05c5d1eec..b17d1fefe8 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
@@ -74,8 +74,8 @@ function HomeTabFeaturedPlugins({plugin}: HomeTabFeaturedPluginsProps) {
   }
   const startCookbook = async () => {
     await plugin.appManager.activatePlugin(['cookbookdev'])
-    plugin.verticalIcons.select('cookbook.dev')
-    _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'cookbook.dev'])
+    plugin.verticalIcons.select('cookbookdev')
+    _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'cookbookdev'])
   }
   const startSolidityUnitTesting = async () => {
     await plugin.appManager.activatePlugin(['solidity', 'solidityUnitTesting'])
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
index 483de9ed54..422405dc9a 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
@@ -201,6 +201,7 @@ contract HelloWorld {
 
   const handleSwichToRecentWorkspace = async (e, workspaceName) => {
     e.preventDefault()
+    _paq.push(['trackEvent', 'hometab', 'filesSection', 'loadRecentWorkspace'])
     await plugin.call('filePanel', 'switchToWorkspace', { name: workspaceName, isLocalhost: false })
   }
 
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
index bf736529db..ecb4cd4ac2 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx
@@ -79,10 +79,7 @@ function HomeTabGetStarted({plugin}: HomeTabGetStartedProps) {
   return (
     <div className="pl-2" id="hTGetStartedSection">
       <label style={{fontSize: '1.2rem'}}>
-        <span className="mr-2">
-          <FormattedMessage id="home.getStarted" />
-        </span>
-        - <FormattedMessage id="home.projectTemplates" />
+        <FormattedMessage id="home.projectTemplates" />
       </label>
       <div ref={carouselRefDiv} className="w-100 d-flex flex-column">
         <ThemeContext.Provider value={themeFilter}>
@@ -114,48 +111,54 @@ function HomeTabGetStarted({plugin}: HomeTabGetStartedProps) {
           >
             <WorkspaceTemplate
               gsID="sUTLogo"
-              workspaceTitle="Gnosis Safe MultiSig"
+              workspaceTitle="MultiSig"
               description={
                 intl.formatMessage({ id: 'home.gnosisSafeMultisigTemplateDesc' })
               }
+              projectLogo="assets/img/gnosissafeLogo.png"
               callback={() => createWorkspace("gnosisSafeMultisig")}
             />
             <WorkspaceTemplate
               gsID="sUTLogo"
-              workspaceTitle="0xProject ERC20"
+              workspaceTitle="ERC20"
               description={
                 intl.formatMessage({ id: 'home.zeroxErc20TemplateDesc' })
               }
+              projectLogo="assets/img/oxprojectLogo.png"
               callback={() => createWorkspace("zeroxErc20")}
             />
             <WorkspaceTemplate
               gsID="sourcifyLogo"
-              workspaceTitle="OpenZeppelin ERC20"
+              workspaceTitle="ERC20"
               description={intl.formatMessage({id: 'home.ozerc20TemplateDesc'})}
+              projectLogo="assets/img/openzeppelinLogo.png"
               callback={() => createWorkspace('ozerc20')}
             />
             <WorkspaceTemplate
               gsID="sUTLogo"
-              workspaceTitle="OpenZeppelin ERC721"
+              workspaceTitle="ERC721"
               description={intl.formatMessage({
                 id: 'home.ozerc721TemplateDesc'
               })}
+              projectLogo="assets/img/openzeppelinLogo.png"
               callback={() => createWorkspace("ozerc721")}
             />
             <WorkspaceTemplate
               gsID="sUTLogo"
-              workspaceTitle="OpenZeppelin ERC1155"
+              workspaceTitle="ERC1155"
               description={intl.formatMessage({
                 id: 'home.ozerc1155TemplateDesc'
               })}
+              projectLogo="assets/img/openzeppelinLogo.png"
               callback={() => createWorkspace("ozerc1155")}
             />
             <WorkspaceTemplate
               gsID="solhintLogo"
-              workspaceTitle="Remix Basic"
+              workspaceTitle="Basic"
               description={intl.formatMessage({
                 id: 'home.remixDefaultTemplateDesc'
               })}
+              projectLogo="assets/img/remixverticaltextLogo.png"
               callback={() => createWorkspace("remixDefault")}
             />
           </Carousel>
diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
index dd8b1153af..0b47e649b8 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTablangOptions.tsx
@@ -28,7 +28,7 @@ export function LanguageOptions({ plugin }: { plugin: any }) {
     <>
       <div style={{position: 'absolute', right: "1rem", paddingTop: "0.4rem"}}>
         <Dropdown>
-          <Dropdown.Toggle title={langOptions} id="languagedropdown" size="sm" style={{backgroundColor: 'var(--secondary)'}}>
+          <Dropdown.Toggle title={langOptions} id="languagedropdown" size="sm" style={{backgroundColor: 'var(--secondary)', color: 'var(--text)'}}>
             {langOptions}
           </Dropdown.Toggle>
           <Dropdown.Menu className="dropdown-menu langSelector" style={{ paddingTop: "0px", paddingBottom: "0px", minWidth: 'fit-content', backgroundColor: 'var(--body-bg)'}}>
diff --git a/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx b/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx
index 2a1d78da58..6fa131d702 100644
--- a/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/workspaceTemplate.tsx
@@ -1,23 +1,33 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import React, {useContext} from 'react'
+import {CustomTooltip} from '@remix-ui/helper'
+import {ThemeContext} from '../themeContext'
+
 interface WorkspaceTemplateProps {
   gsID: string
   workspaceTitle: string
+  projectLogo: string
   callback: any
   description: string
 }
 
-function WorkspaceTemplate({gsID, workspaceTitle, description, callback}: WorkspaceTemplateProps) {
+function WorkspaceTemplate({gsID, workspaceTitle, description, projectLogo, callback}: WorkspaceTemplateProps) {
+  const themeFilter = useContext(ThemeContext)
+
   return (
     <div className="d-flex remixui_home_workspaceTemplate">
       <button
-        className="btn border-secondary p-1 d-flex flex-column  text-nowrap justify-content-center align-items-center mr-2 remixui_home_workspaceTemplate"
+        className="btn border-secondary p-1 d-flex flex-column  text-nowrap justify-content-center mr-2 remixui_home_workspaceTemplate"
         data-id={'landingPageStart' + gsID}
         onClick={() => callback()}
       >
-        <div className="mb-2 w-100 p-2 h-100 align-items-start d-flex flex-column">
-          <label className="h6 pb-1 text-uppercase text-dark remixui_home_cursorStyle">{workspaceTitle}</label>
-          <div className="remixui_home_gtDescription">{description}</div>
+        <div className="w-100 p-1 h-100 align-items-center d-flex flex-column">
+          <CustomTooltip placement={'top'} tooltipClasses="text-wrap" tooltipId="etherscan-receipt-proxy-status" tooltipText={description}>
+            <div className='d-flex flex-column align-items-center'>
+              <label className="h5 pb-1 mt-1 text-uppercase remixui_home_cursorStyle" style={{color: themeFilter.name == "dark" ? "var(--white)" : "var(--black)"}}>{workspaceTitle}</label>
+              <img className="" src={projectLogo} alt="" style={{height: "20px", width: "fit-content", filter: themeFilter.name == "dark" ? "invert(1)" : "invert(0)"}} />
+            </div>
+          </CustomTooltip>
         </div>
       </button>
     </div>
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
index 3a8e7d6a06..a7fa9b4da4 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.css
@@ -76,8 +76,8 @@
   text-align: left;
 }
 .remixui_home_cursorStyle {
-  cursor: pointer;
-  font-size: 0.8rem;
+  cursor: pointer;  
+  font-weight: 900;
 }
 .remixui_home_envButton {
   width: 220px;
diff --git a/libs/remix-ui/renderer/src/lib/renderer.tsx b/libs/remix-ui/renderer/src/lib/renderer.tsx
index 34b956ee7f..f79cec142f 100644
--- a/libs/remix-ui/renderer/src/lib/renderer.tsx
+++ b/libs/remix-ui/renderer/src/lib/renderer.tsx
@@ -78,7 +78,7 @@ export const Renderer = ({message, opt = {}, plugin}: RendererProps) => {
       explain why the error occurred and how to fix it.
       `
       await plugin.call('openaigpt', 'message', message)
-      _paq.push(['trackEvent', 'GPTSupport', 'askGPT'])
+      _paq.push(['trackEvent', 'ai', 'openai', 'explainSolidityError'])
     } catch (err) {
       console.error('unable to askGtp')
       console.error(err)
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
index 91d423566f..95e6160409 100644
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@@ -1,11 +1,16 @@
-import React, {useState, useReducer, useEffect, useCallback} from 'react' // eslint-disable-line
+import {ViewPlugin} from '@remixproject/engine-web'
+import React, {useState, useRef, useReducer, useEffect, useCallback} from 'react' // eslint-disable-line
 
+import {AppModal, AlertModal, ModalTypes} from '@remix-ui/app'
 import {labels, textDark, textSecondary} from './constants'
 
 import './remix-ui-settings.css'
 import {
   generateContractMetadat,
   personal,
+  copilotActivate,
+  copilotMaxNewToken,
+  copilotTemperature,
   textWrapEventAction,
   useMatomoAnalytics,
   saveTokenToast,
@@ -23,10 +28,10 @@ import {RemixUiLocaleModule, LocaleModule} from '@remix-ui/locale-module'
 import {FormattedMessage, useIntl} from 'react-intl'
 import {GithubSettings} from './github-settings'
 import {EtherscanSettings} from './etherscan-settings'
-import {CustomTooltip} from '@remix-ui/helper'
 
 /* eslint-disable-next-line */
 export interface RemixUiSettingsProps {
+  plugin: ViewPlugin
   config: any
   editor: any
   _deps: any
@@ -48,6 +53,8 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
   const [ipfsProtocol, setipfsProtocol] = useState('')
   const [ipfsProjectId, setipfsProjectId] = useState('')
   const [ipfsProjectSecret, setipfsProjectSecret] = useState('')
+  const copilotDownload = useRef(null)
+
   const intl = useIntl()
   const initValue = () => {
     const metadataConfig = props.config.get('settings/generate-contract-metadata')
@@ -122,6 +129,57 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     textWrapEventAction(props.config, props.editor, event.target.checked, dispatch)
   }
 
+  const onchangeCopilotActivate = async (event) => {
+    if (!event.target.checked) {
+      copilotActivate(props.config, event.target.checked, dispatch)
+      props.plugin.call('copilot-suggestion', 'uninstall')
+      return
+    }   
+    const message = <div>Please wait while the copilot is downloaded. <span ref={copilotDownload}>0</span>/100 .</div>
+    props.plugin.on('copilot-suggestion', 'loading', (data) => {
+      if (!copilotDownload.current) return
+      const loaded = ((data.loaded / data.total) * 100).toString()
+      const dot = loaded.match(/(.*)\./g)
+      copilotDownload.current.innerText = dot ? dot[0].replace('.', '') : loaded
+    })
+    const modalActivate: AppModal = {
+      id: 'loadcopilotActivate',
+      title: 'Download Solidity copilot',
+      modalType: ModalTypes.default,
+      okLabel: 'Close',
+      message,
+      okFn: async() => {
+        props.plugin.off('copilot-suggestion', 'loading')
+        if (await props.plugin.call('copilot-suggestion', 'status')) {
+          copilotActivate(props.config, true, dispatch)          
+        } else {
+          props.plugin.call('copilot-suggestion', 'uninstall')
+          copilotActivate(props.config, false, dispatch)
+        }
+      },
+      hideFn: async () => {
+        props.plugin.off('copilot-suggestion', 'loading')
+        if (await props.plugin.call('copilot-suggestion', 'status')) {
+          copilotActivate(props.config, true, dispatch)          
+        } else {
+          props.plugin.call('copilot-suggestion', 'uninstall')
+          copilotActivate(props.config, false, dispatch)
+        }
+      }
+    }
+    props.plugin.call('copilot-suggestion', 'init')
+    props.plugin.call('notification', 'modal', modalActivate)
+    
+  }
+
+  const onchangeCopilotMaxNewToken = (event) => {
+    copilotMaxNewToken(props.config, parseInt(event.target.value), dispatch)
+  }
+
+  const onchangeCopilotTemperature = (event) => {
+    copilotTemperature(props.config, parseInt(event.target.value) / 100, dispatch)
+  }
+
   const onchangePersonal = (event) => {
     personal(props.config, event.target.checked, dispatch)
   }
@@ -377,6 +435,63 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     saveIpfsSettingsToast(props.config, dispatchToast, ipfsUrl, ipfsProtocol, ipfsPort, ipfsProjectId, ipfsProjectSecret)
   }
 
+  const isCopilotActivated = props.config.get('settings/copilot/suggest/activate') || false
+  const copilotMaxnewToken = props.config.get('settings/copilot/suggest/max_new_tokens')
+  if (!copilotMaxnewToken) props.config.set('settings/copilot/suggest/max_new_tokens', 5)
+  const copilotTemperatureValue = (props.config.get('settings/copilot/suggest/temperature')) * 100
+  if (!copilotTemperatureValue) props.config.set('settings/copilot/suggest/temperature', 0.5)
+
+  if (isCopilotActivated) props.plugin.call('copilot-suggestion', 'init')
+  const copilotSettings = () => (
+    <div className="border-top">
+      <div className="card-body pt-3 pb-2">
+        <h6 className="card-title">
+          <FormattedMessage id="settings.copilot" />
+        </h6>
+
+        <div className="pt-2 mb-0">
+          <div className="text-secondary mb-0 h6">
+            <div>
+              <div className="custom-control custom-checkbox mb-1">
+                <input onChange={onchangeCopilotActivate} id="copilot-activate" type="checkbox" className="custom-control-input" checked={isCopilotActivated} />
+                <label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/copilot/suggest/activate')}`} htmlFor="copilot-activate">
+                  <FormattedMessage id="settings.copilot.activate" />
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="pt-2 mb-0">
+          <div className="text-secondary mb-0 h6">
+            <div>
+              <div className="mb-1">
+                <label className={`form-check-label align-middle ${getTextClass('settings/copilot/suggest/max_new_tokens')}`} htmlFor="copilot-activate">
+                  <FormattedMessage id="settings.copilot.max_new_tokens" /> - <span>{copilotMaxnewToken}</span>
+                </label>
+                <input onChange={onchangeCopilotMaxNewToken} id="copilot-max-new-token" value={copilotMaxnewToken} min='1' max='150' type="range" className="custom-range" />                
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div className="pt-2 mb-0">
+          <div className="text-secondary mb-0 h6">
+            <div>
+              <div className="mb-1">
+                <label className={`form-check-label align-middle ${getTextClass('settings/copilot/suggest/temperature')}`} htmlFor="copilot-activate">
+                  <FormattedMessage id="settings.copilot.temperature" /> - <span>{copilotTemperatureValue / 100}</span>
+                </label>
+                <input onChange={onchangeCopilotTemperature} id="copilot-temperature" value={copilotTemperatureValue} min='0' max='100' type="range" className="custom-range" />                
+              </div>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+  )
+
   const ipfsSettings = () => (
     <div className="border-top">
       <div className="card-body pt-3 pb-2">
@@ -455,6 +570,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
     <div>
       {state.message ? <Toaster message={state.message} /> : null}
       {generalConfig()}
+      {copilotSettings()}
       <GithubSettings
         saveToken={(githubToken: string, githubUserName: string, githubEmail: string) => {
           saveTokenToast(props.config, dispatchToast, githubToken, 'gist-access-token')
@@ -480,7 +596,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
       {swarmSettings()}
       {ipfsSettings()}
       <RemixUiThemeModule themeModule={props._deps.themeModule} />
-      <RemixUiLocaleModule localeModule={props._deps.localeModule} />
+      <RemixUiLocaleModule localeModule={props._deps.localeModule} />      
     </div>
   )
 }
diff --git a/libs/remix-ui/settings/src/lib/settingsAction.ts b/libs/remix-ui/settings/src/lib/settingsAction.ts
index 87ecd3c0d3..cc5b096ee0 100644
--- a/libs/remix-ui/settings/src/lib/settingsAction.ts
+++ b/libs/remix-ui/settings/src/lib/settingsAction.ts
@@ -24,13 +24,26 @@ export const personal = (config, checked, dispatch) => {
   dispatch({ type: 'personal', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
 }
 
+export const copilotActivate = (config, checked, dispatch) => {
+  config.set('settings/copilot/suggest/activate', checked)
+  dispatch({ type: 'copilot/suggest/activate', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
+}
+
+export const copilotMaxNewToken = (config, checked, dispatch) => {
+  config.set('settings/copilot/suggest/max_new_tokens', checked)
+  dispatch({ type: 'copilot/suggest/max_new_tokens', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
+}
+
+export const copilotTemperature = (config, checked, dispatch) => {
+  config.set('settings/copilot/suggest/temperature', checked)
+  dispatch({ type: 'copilot/suggest/temperature', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
+}
+
 export const useMatomoAnalytics = (config, checked, dispatch) => {
   config.set('settings/matomo-analytics', checked)
   dispatch({ type: 'useMatomoAnalytics', payload: { isChecked: checked, textClass: checked ? textDark : textSecondary } })
   if (checked) {
     _paq.push(['forgetUserOptOut'])
-    // @TODO remove next line when https://github.com/matomo-org/matomo/commit/9e10a150585522ca30ecdd275007a882a70c6df5 is used
-    document.cookie = 'mtm_consent_removed=; expires=Thu, 01 Jan 1970 00:00:01 GMT;'
   } else {
     _paq.push(['optUserOut'])
   }
diff --git a/libs/remix-ui/settings/src/lib/settingsReducer.ts b/libs/remix-ui/settings/src/lib/settingsReducer.ts
index 4c1db50ad2..abad510431 100644
--- a/libs/remix-ui/settings/src/lib/settingsReducer.ts
+++ b/libs/remix-ui/settings/src/lib/settingsReducer.ts
@@ -41,6 +41,21 @@ export const initialState = {
       name: 'displayErrors',
       isChecked: true,
       textClass: textSecondary
+    },
+    {
+      name: 'copilot/suggest/activate',
+      isChecked: false,
+      textClass: textSecondary
+    },
+    {
+      name: 'copilot/suggest/max_new_tokens',
+      value: 5,
+      textClass: textSecondary
+    },
+    {
+      name: 'copilot/suggest/temperature',
+      value: 0.5,
+      textClass: textSecondary
     }
   ]
 }
@@ -128,6 +143,36 @@ export const settingReducer = (state, action) => {
     return {
       ...state
     }
+  case 'copilot/suggest/activate':
+    state.elementState.map(element => {
+      if (element.name === 'copilot/suggest/activate') {
+        element.isChecked = action.payload.isChecked
+        element.textClass = action.payload.textClass
+      }
+    })
+    return {
+      ...state
+    }
+  case 'copilot/suggest/max_new_tokens':
+    state.elementState.map(element => {
+      if (element.name === 'copilot/suggest/max_new_tokens') {
+        element.value = action.payload.value
+        element.textClass = action.payload.textClass
+      }
+    })
+    return {
+      ...state
+    }
+  case 'copilot/suggest/temperature':
+    state.elementState.map(element => {
+      if (element.name === 'useShowGasInEditor') {
+        element.value = action.payload.value
+        element.textClass = action.payload.textClass
+      }
+    })
+    return {
+      ...state
+    }
   default:
     return initialState
   }
diff --git a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
index 67186833e6..dbac924262 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -66,6 +66,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     compiledFileName: '',
     includeNightlies: false,
     language: 'Solidity',
+    remappings: [],
     evmVersion: '',
     createFileOnce: true,
     onlyDownloaded: false
@@ -819,15 +820,20 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             </label>
 
             <CustomTooltip
-              placement="top"
+              placement="bottom"
               tooltipId="promptCompilerTooltip"
               tooltipClasses="text-nowrap"
               tooltipText={<FormattedMessage id="solidity.addACustomCompilerWithURL" />}
             >
               <span className="far fa-plus border-0 p-0 ml-3" onClick={() => promptCompiler()}></span>
             </CustomTooltip>
-            <CustomTooltip placement="top" tooltipId="showCompilerTooltip" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="solidity.seeCompilerLicense" />}>
-              <span className="fa fa-file-text-o border-0 p-0 ml-2" onClick={() => showCompilerLicense()}></span>
+            <CustomTooltip
+              placement="bottom"
+              tooltipId="showCompilerTooltip"
+              tooltipClasses="text-nowrap"
+              tooltipText={<FormattedMessage id="solidity.seeCompilerLicense" />}
+            >
+              <span className="far fa-file-certificate border-0 p-0 ml-2" onClick={() => showCompilerLicense()}></span>
             </CustomTooltip>
             <CompilerDropdown
               allversions={state.allversions}
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 9f36b48e9c..958ef3a06a 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -106,10 +106,15 @@ export class CompileTabLogic {
   compileFile (target) {
     if (!target) throw new Error('No target provided for compiliation')
     return new Promise((resolve, reject) => {
-      this.api.readFile(target).then((content) => {
+      this.api.readFile(target).then(async(content) => {
         const sources = { [target]: { content } }
         this.event.emit('removeAnnotations')
         this.event.emit('startingCompilation')
+        if(await this.api.fileExists('remappings.txt')) {
+          this.api.readFile('remappings.txt').then(remappings => {
+            this.compiler.set('remappings', remappings.split('\n').filter(Boolean))
+          })
+        } else this.compiler.set('remappings', [])
         if (this.configFilePath) {
           this.api.readFile(this.configFilePath).then( contentConfig => {
             this.compiler.set('configFileContent', contentConfig)
diff --git a/libs/remix-ui/terminal/src/lib/components/Context.tsx b/libs/remix-ui/terminal/src/lib/components/Context.tsx
index 197d022750..60a4baa00b 100644
--- a/libs/remix-ui/terminal/src/lib/components/Context.tsx
+++ b/libs/remix-ui/terminal/src/lib/components/Context.tsx
@@ -16,7 +16,7 @@ const Context = ({opts, provider}: {opts; provider: string}) => {
   const i = data.receipt ? data.transactionIndex : data.transactionIndex
   const value = val ? typeConversion.toInt(val) : 0
 
-  if (provider.startsWith('vm')) {
+  if (provider && provider.startsWith('vm')) {
     return (
       <div>
         <span>
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index ec2e8bd5bb..88c55a465e 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -28,6 +28,7 @@ import RenderKnownTransactions from './components/RenderKnownTransactions' // es
 import parse from 'html-react-parser'
 import { EMPTY_BLOCK, KNOWN_TRANSACTION, RemixUiTerminalProps, UNKNOWN_TRANSACTION } from './types/terminalTypes'
 import { wrapScript } from './utils/wrapScript'
+const _paq = (window._paq = window._paq || [])
 
 /* eslint-disable-next-line */
 export interface ClipboardEvent<T = Element> extends SyntheticEvent<T, any> {
@@ -229,6 +230,10 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     try {
       if (script.trim().startsWith('git')) {
         // await this.call('git', 'execute', script) code might be used in the future
+      } else if (script.trim().startsWith('gpt')) {
+        call('terminal', 'log',{ type: 'warn', value: `> ${script}` })
+        await call('openaigpt', 'message', script)
+        _paq.push(['trackEvent', 'ai', 'openai', 'askFromTerminal'])
       } else {
         await call('scriptRunner', 'execute', script)
       }
diff --git a/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx b/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
index cfb456f020..1c7821a461 100644
--- a/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
+++ b/libs/remix-ui/terminal/src/lib/terminalWelcome.tsx
@@ -46,7 +46,7 @@ const TerminalWelcomeMessage = ({packageJson, storage}) => {
       <ul className="ml-0 mr-4">
         <li key="web3-152">
           <a target="_blank" href="https://web3js.readthedocs.io/en/1.0/">
-            web3 version 1.5.2
+            web3.js
           </a>
         </li>
         <li key="ethers-console">
@@ -54,7 +54,9 @@ const TerminalWelcomeMessage = ({packageJson, storage}) => {
             ethers.js
           </a>{' '}
         </li>
-        <li key="remix-console">remix</li>
+        <li key="ethers-console">
+          gpt <i>&lt;your question here&gt;</i> {' '}
+        </li>
       </ul>
       <div>
         <FormattedMessage id="terminal.welcomeText10" />.
diff --git a/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts b/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts
index 75b1972869..26ded2f581 100644
--- a/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts
+++ b/libs/remix-ui/terminal/src/lib/utils/wrapScript.ts
@@ -1,5 +1,5 @@
 export const wrapScript = (script) => {
-  const isKnownScript = ['remix.', 'console.', 'git'].some(prefix => script.trim().startsWith(prefix))
+  const isKnownScript = ['remix.', 'console.', 'git', 'gpt'].some(prefix => script.trim().startsWith(prefix))
   if (isKnownScript) return script
   return `
         try {
diff --git a/libs/remix-ui/workspace/src/lib/actions/payload.ts b/libs/remix-ui/workspace/src/lib/actions/payload.ts
index a7bf2e741e..91966e8af3 100644
--- a/libs/remix-ui/workspace/src/lib/actions/payload.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/payload.ts
@@ -294,6 +294,13 @@ export const setCurrentWorkspaceIsGitRepo = (isRepo: boolean): Action<'SET_CURRE
   }
 }
 
+export const setCurrentWorkspaceHasGitSubmodules = (hasGitSubmodules: boolean): Action<'SET_CURRENT_WORKSPACE_HAS_GIT_SUBMODULES'> => {
+  return {
+    type: 'SET_CURRENT_WORKSPACE_HAS_GIT_SUBMODULES',
+    payload: hasGitSubmodules
+  }
+}
+
 export const setGitConfig = (config: {username: string, token: string, email: string}): Action<'SET_GIT_CONFIG'> => {
   return {
     type: 'SET_GIT_CONFIG',
diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index 43a4cb0ab4..0b8122bbf4 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -25,7 +25,8 @@ import {
   setRenameWorkspace,
   setCurrentWorkspaceIsGitRepo,
   setGitConfig,
-  setElectronRecentFolders
+  setElectronRecentFolders,
+  setCurrentWorkspaceHasGitSubmodules,
 } from './payload'
 import { addSlash, checkSlash, checkSpecialChars } from '@remix-ui/helper'
 
@@ -79,6 +80,11 @@ export const setPlugin = (filePanelPlugin, reducerDispatch) => {
   plugin.on('settings', 'configChanged', async () => {
     await getGitConfig()
   })
+  plugin.on('fileManager', 'fileAdded', async (filePath: string) => {
+    if(filePath.includes('.gitmodules')) {
+      await checkGit()
+    }
+  })
   getGitConfig()
 }
 
@@ -178,7 +184,7 @@ export const createWorkspace = async (
       const isActive = await plugin.call('manager', 'isActive', 'dgit')
       if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
     }
-    if (workspaceTemplateName === 'semaphore') {
+    if (workspaceTemplateName === 'semaphore' || workspaceTemplateName === 'hashchecker' || workspaceTemplateName === 'rln') {
       const isCircomActive = await plugin.call('manager', 'isActive', 'circuit-compiler')
       if (!isCircomActive) await plugin.call('manager', 'activatePlugin', 'circuit-compiler')
     }
@@ -442,7 +448,6 @@ export const switchToWorkspace = async (name: string) => {
     await plugin.fileProviders.workspace.setWorkspace(name)
     await plugin.setWorkspace({ name, isLocalhost: false })
     const isGitRepo = await plugin.fileManager.isGitRepo()
-
     if (isGitRepo) {
       const isActive = await plugin.call('manager', 'isActive', 'dgit')
       if (!isActive) await plugin.call('manager', 'activatePlugin', 'dgit')
@@ -532,9 +537,9 @@ export const uploadFolder = async (target, targetFolder: string, cb?: (err: Erro
   }
 }
 
-export const getWorkspaces = async (): Promise<{ name: string; isGitRepo: boolean; branches?: { remote: any; name: string }[]; currentBranch?: string }[]> | undefined => {
+export const getWorkspaces = async (): Promise<{ name: string; isGitRepo: boolean; hasGitSubmodules: boolean; branches?: { remote: any; name: string }[]; currentBranch?: string }[]> | undefined => {
   try {
-    const workspaces: { name: string; isGitRepo: boolean; branches?: { remote: any; name: string }[]; currentBranch?: string }[] = await new Promise((resolve, reject) => {
+    const workspaces: { name: string; isGitRepo: boolean; hasGitSubmodules: boolean; branches?: { remote: any; name: string }[]; currentBranch?: string }[] = await new Promise((resolve, reject) => {
       const workspacesPath = plugin.fileProviders.workspace.workspacesPath
 
       plugin.fileProviders.browser.resolveDirectory('/' + workspacesPath, (error, items) => {
@@ -546,7 +551,7 @@ export const getWorkspaces = async (): Promise<{ name: string; isGitRepo: boolea
             .filter((item) => items[item].isDirectory)
             .map(async (folder) => {
               const isGitRepo: boolean = await plugin.fileProviders.browser.exists('/' + folder + '/.git')
-
+              const hasGitSubmodules: boolean = await plugin.fileProviders.browser.exists('/' + folder + '/.gitmodules')
               if (isGitRepo) {
                 let branches = []
                 let currentBranch = null
@@ -558,11 +563,13 @@ export const getWorkspaces = async (): Promise<{ name: string; isGitRepo: boolea
                   isGitRepo,
                   branches,
                   currentBranch,
+                  hasGitSubmodules
                 }
               } else {
                 return {
                   name: folder.replace(workspacesPath + '/', ''),
                   isGitRepo,
+                  hasGitSubmodules
                 }
               }
             })
@@ -638,7 +645,9 @@ export const cloneRepository = async (url: string) => {
 
 export const checkGit = async () => {
   const isGitRepo = await plugin.fileManager.isGitRepo()
+  const hasGitSubmodule = await plugin.fileManager.hasGitSubmodules()
   dispatch(setCurrentWorkspaceIsGitRepo(isGitRepo))
+  dispatch(setCurrentWorkspaceHasGitSubmodules(hasGitSubmodule))
   await refreshBranches()
   const currentBranch = await plugin.call('dGitProvider', 'currentbranch')
   dispatch(setCurrentWorkspaceCurrentBranch(currentBranch))
@@ -803,6 +812,15 @@ export const createHelperScripts = async (script: string) => {
   plugin.call('notification', 'toast', 'scripts added in the "scripts" folder')
 }
 
+export const updateGitSubmodules = async () => {
+  dispatch(cloneRepositoryRequest())
+  const config = plugin.registry.get('config').api
+  const token = config.get('settings/gist-access-token')
+  const repoConfig = { token }
+  await plugin.call('dGitProvider', 'updateSubmodules', repoConfig)
+  dispatch(cloneRepositorySuccess())
+}
+
 export const checkoutRemoteBranch = async (branch: string, remote: string) => {
   const localChanges = await hasLocalChanges()
 
diff --git a/libs/remix-ui/workspace/src/lib/contexts/index.ts b/libs/remix-ui/workspace/src/lib/contexts/index.ts
index 9410e6ada9..3f809b56ad 100644
--- a/libs/remix-ui/workspace/src/lib/contexts/index.ts
+++ b/libs/remix-ui/workspace/src/lib/contexts/index.ts
@@ -49,6 +49,7 @@ export const FileSystemContext = createContext<{
   dispatchOpenElectronFolder: (path: string) => Promise<void>
   dispatchGetElectronRecentFolders: () => Promise<void>
   dispatchRemoveRecentFolder: (path: string) => Promise<void>
+  dispatchUpdateGitSubmodules: () => Promise<void>
     }>(null)
   
     
\ No newline at end of file
diff --git a/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx b/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx
index 50e74f26df..9759e98746 100644
--- a/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx
+++ b/libs/remix-ui/workspace/src/lib/providers/FileSystemProvider.tsx
@@ -46,7 +46,10 @@ import {
   createTsSolGithubAction,
   createSlitherGithubAction,
   createHelperScripts,
-  openElectronFolder, getElectronRecentFolders, removeRecentElectronFolder
+  openElectronFolder, 
+  getElectronRecentFolders, 
+  removeRecentElectronFolder,
+  updateGitSubmodules
 } from '../actions'
 import {Modal, WorkspaceProps, WorkspaceTemplate} from '../types'
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -238,6 +241,10 @@ export const FileSystemProvider = (props: WorkspaceProps) => {
   }
 
 
+  const dispatchUpdateGitSubmodules = async () => {
+    await updateGitSubmodules()
+  }
+
   useEffect(() => {
     dispatchInitWorkspace()
   }, [])
@@ -362,7 +369,8 @@ export const FileSystemProvider = (props: WorkspaceProps) => {
     dispatchCreateHelperScripts,
     dispatchOpenElectronFolder,
     dispatchGetElectronRecentFolders,
-    dispatchRemoveRecentFolder
+    dispatchRemoveRecentFolder,
+    dispatchUpdateGitSubmodules
   }
   return (
     <FileSystemContext.Provider value={value}>
diff --git a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
index 05583089f3..04ca870884 100644
--- a/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/reducers/workspace.ts
@@ -9,6 +9,7 @@ export interface BrowserState {
     workspaces: {
       name: string
       isGitRepo: boolean
+      hasGitSubmodules?: boolean
       branches?: {
         remote: any
         name: string
@@ -801,6 +802,22 @@ export const browserReducer = (state = browserInitialState, action: Actions) =>
     }
   }
 
+  case 'SET_CURRENT_WORKSPACE_HAS_GIT_SUBMODULES': {
+    const payload = action.payload
+
+    return {
+      ...state,
+      browser: {
+        ...state.browser,
+        workspaces: state.browser.workspaces.map((workspace) => {
+          if (workspace.name === state.browser.currentWorkspace)
+            workspace.hasGitSubmodules = payload
+          return workspace
+        })
+      }
+    }
+  }
+
   case 'SET_GIT_CONFIG': {
     const payload =
         action.payload
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 30c160a7f7..d46aa060c5 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -28,6 +28,7 @@ export function Workspace() {
   const [selectedWorkspace, setSelectedWorkspace] = useState<{
     name: string
     isGitRepo: boolean
+    hasGitSubmodules?: boolean
     branches?: {remote: any; name: string}[]
     currentBranch?: string
   }>(null)
@@ -155,7 +156,6 @@ export function Workspace() {
 
   useEffect(() => {
     const workspace = global.fs.browser.workspaces.find((workspace) => workspace.name === currentWorkspace)
-
     setSelectedWorkspace(workspace)
   }, [currentWorkspace])
 
@@ -665,6 +665,14 @@ export function Workspace() {
     setShowBranches(isOpen)
   }
 
+  const updateSubModules = async () => {
+    try {
+      await global.dispatchUpdateGitSubmodules()
+    } catch (e) {
+      console.error(e)
+    }
+  }
+
   const handleBranchFilterChange = (e: ChangeEvent<HTMLInputElement>) => {
     const branchFilter = e.target.value
 
@@ -758,6 +766,12 @@ export function Workspace() {
             <option style={{fontSize: 'small'}} value="semaphore">
               {intl.formatMessage({id: 'filePanel.semaphore'})}
             </option>
+            <option style={{fontSize: 'small'}} value="hashchecker">
+              {intl.formatMessage({id: 'filePanel.hashchecker'})}
+            </option>
+            <option style={{fontSize: 'small'}} value="rln">
+              {intl.formatMessage({id: 'filePanel.rln'})}
+            </option>
           </optgroup>
         </select>
 
@@ -1141,6 +1155,12 @@ export function Workspace() {
         <div className={`bg-light border-top ${selectedWorkspace.isGitRepo && currentBranch ? 'd-block' : 'd-none'}`} data-id="workspaceGitPanel">
           <div className="d-flex justify-space-between p-1">
             <div className="mr-auto text-uppercase text-dark pt-2 pl-2">GIT</div>
+            {selectedWorkspace.hasGitSubmodules? 
+              <div className="pt-1 mr-1">
+                {global.fs.browser.isRequestingCloning ? <div style={{ height: 30 }} className='btn btn-sm border text-muted small'><i className="fad fa-spinner fa-spin"></i> updating submodules</div>  :
+                  <div style={{ height: 30 }} onClick={updateSubModules} data-id='updatesubmodules' className='btn btn-sm border text-muted small'>update submodules</div>}
+              </div>  
+              : null}
             <div className="pt-1 mr-1" data-id="workspaceGitBranchesDropdown">
               <Dropdown style={{height: 30, minWidth: 80}} onToggle={toggleBranches} show={showBranches} drop={'up'}>
                 <Dropdown.Toggle
diff --git a/libs/remix-ui/workspace/src/lib/types/index.ts b/libs/remix-ui/workspace/src/lib/types/index.ts
index 406af5dc15..5f938d365e 100644
--- a/libs/remix-ui/workspace/src/lib/types/index.ts
+++ b/libs/remix-ui/workspace/src/lib/types/index.ts
@@ -18,7 +18,7 @@ export interface JSONStandardInput {
   }
 }
 export type MenuItems = action[]
-export type WorkspaceTemplate = 'gist-template' | 'code-template' | 'remixDefault' | 'blank' | 'ozerc20' | 'zeroxErc20' | 'ozerc721' | 'playground' | 'semaphore'
+export type WorkspaceTemplate = 'gist-template' | 'code-template' | 'remixDefault' | 'blank' | 'ozerc20' | 'zeroxErc20' | 'ozerc721' | 'playground' | 'semaphore' | 'hashchecker' | 'rln'
 export interface WorkspaceProps {
   plugin: FilePanelType
 }
@@ -294,6 +294,7 @@ export interface ActionPayloadTypes {
   SET_CURRENT_WORKSPACE_BRANCHES: { remote: string | undefined; name: string }[],
   SET_CURRENT_WORKSPACE_CURRENT_BRANCH: string,
   SET_CURRENT_WORKSPACE_IS_GITREPO: boolean,
+  SET_CURRENT_WORKSPACE_HAS_GIT_SUBMODULES: boolean,
   SET_GIT_CONFIG: {
     username: string;
     token: string;
diff --git a/libs/remix-ui/workspace/src/lib/utils/constants.ts b/libs/remix-ui/workspace/src/lib/utils/constants.ts
index 60f0d03ea0..df0265fd26 100644
--- a/libs/remix-ui/workspace/src/lib/utils/constants.ts
+++ b/libs/remix-ui/workspace/src/lib/utils/constants.ts
@@ -82,5 +82,7 @@ export const TEMPLATE_NAMES = {
   'zeroxErc20': '0xProject ERC20',
   'gnosisSafeMultisig': 'Gnosis Safe',
   'playground': 'Playground',
-  'semaphore': 'Semaphore'
+  'semaphore': 'Semaphore',
+  'hashchecker': 'Hash Checker',
+  'rln': 'Rate-Limiting Nullifier'
 }
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index c21d81ac0f..b80519a656 100644
--- a/libs/remix-url-resolver/package.json
+++ b/libs/remix-url-resolver/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-url-resolver",
-  "version": "0.0.65",
+  "version": "0.0.66",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -25,6 +25,7 @@
   "dependencies": {
     "@erebos/bzz-node": "^0.13.0",
     "axios": "1.2.2",
+    "semver": "^7.5.4",
     "url": "^0.11.0",
     "valid-url": "^1.0.9"
   },
@@ -40,5 +41,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index de4bc0c320..f66f8fa012 100644
--- a/libs/remix-ws-templates/package.json
+++ b/libs/remix-ws-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remix-ws-templates",
-  "version": "1.0.30",
+  "version": "1.0.31",
   "description": "Create a Remix IDE workspace using different templates",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -24,5 +24,5 @@
     "ethers": "^5.4.2",
     "web3": "^4.1.1"
   },
-  "gitHead": "b8606fe2db170b6ef7cdd19b498db74cf2fb14b1"
+  "gitHead": "29e14eb9e9750b43522e3667bb340ff6884d1ebf"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/index.ts b/libs/remix-ws-templates/src/index.ts
index 48c239019b..2955f961db 100644
--- a/libs/remix-ws-templates/src/index.ts
+++ b/libs/remix-ws-templates/src/index.ts
@@ -7,6 +7,8 @@ export { default as zeroxErc20 } from './templates/zeroxErc20'
 export { default as gnosisSafeMultisig } from './templates/gnosisSafeMultisig'
 export { default as playground } from './templates/playground'
 export { default as semaphore } from './templates/semaphore'
+export { default as hashchecker } from './templates/hashchecker'
+export { default as rln } from './templates/rln'
 
 export { contractDeployerScripts } from './script-templates/contract-deployer'
 export { etherscanScripts } from './script-templates/etherscan'
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/README.txt b/libs/remix-ws-templates/src/templates/hashchecker/README.txt
new file mode 100644
index 0000000000..1ba1c46b22
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/README.txt
@@ -0,0 +1,10 @@
+CIRCOM ZKP Hash Checker WORKSPACE
+
+Welcome to the Remix Circom ZKP Hash Checker Workspace. 
+
+The workspace comprises two main directories:
+
+- circuits: Contains sample Hash Checker contracts. These can be compiled to generate a witness using 'Circom ZKP Compiler' plugin.
+- scripts: Provides a sample script designed for a trusted setup using snarkjs. This script also aids in generating Solidity code, 
+which is essential for on-chain deployment.
+
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/circuits/calculate_hash.circom b/libs/remix-ws-templates/src/templates/hashchecker/circuits/calculate_hash.circom
new file mode 100644
index 0000000000..770b266798
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/circuits/calculate_hash.circom
@@ -0,0 +1,41 @@
+pragma circom 2.0.0;
+
+include "circomlib/poseidon.circom";
+
+template CalculateHash() {
+    signal input value1;
+    signal input value2;
+    signal input value3;
+    signal input value4;
+    signal output out;
+
+    component poseidon = Poseidon(4);
+
+    poseidon.inputs[0] <== value1;
+    poseidon.inputs[1] <== value2;
+    poseidon.inputs[2] <== value3;
+    poseidon.inputs[3] <== value4;
+
+    out <== poseidon.out;
+}
+template HashChecker() {
+    signal input value1;
+    signal input value2;
+    signal input value3;
+    signal input value4;
+    signal input hash;
+
+    component calculateSecret = CalculateHash();
+    calculateSecret.value1 <== value1;
+    calculateSecret.value2 <== value2;
+    calculateSecret.value3 <== value3;
+    calculateSecret.value4 <== value4;
+
+    signal calculatedHash;
+    calculatedHash <== calculateSecret.out;
+
+    assert(hash == calculatedHash);
+    
+}
+
+component main {public [hash]} = HashChecker();
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/index.ts b/libs/remix-ws-templates/src/templates/hashchecker/index.ts
new file mode 100644
index 0000000000..bcae81f336
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/index.ts
@@ -0,0 +1,14 @@
+export default async () => {
+  return {
+    // @ts-ignore
+    'circuits/calculate_hash.circom': (await import('raw-loader!./circuits/calculate_hash.circom')).default,
+    // @ts-ignore
+    'scripts/run_setup.ts': (await import('!!raw-loader!./scripts/run_setup.ts')).default,
+    // @ts-ignore
+    'scripts/run_verification.ts': (await import('!!raw-loader!./scripts/run_verification.ts')).default,
+    // @ts-ignore
+    'templates/groth16_verifier.sol.ejs': (await import('!!raw-loader!./templates/groth16_verifier.sol.ejs')).default,
+    // @ts-ignore
+    'README.txt': (await import('raw-loader!./README.txt')).default
+  }
+}
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_setup.ts b/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_setup.ts
new file mode 100644
index 0000000000..1fc7312546
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_setup.ts
@@ -0,0 +1,59 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const snarkjs = require('snarkjs');
+
+const logger = {
+  info: (...args) => console.log(...args),
+  debug: (...args) => console.log(...args)
+};
+
+(async () => {
+  try {
+    // @ts-ignore
+    await remix.call('circuit-compiler', 'generateR1cs', 'circuits/calculate_hash.circom');
+
+    const ptau_final = "https://ipfs-cluster.ethdevops.io/ipfs/QmTiT4eiYz5KF7gQrDsgfCSTRv3wBPYJ4bRN1MmTRshpnW";
+    // @ts-ignore
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash.r1cs', true);
+    // @ts-ignore
+    const r1cs = new Uint8Array(r1csBuffer);
+    const zkey_0 = { type: "mem" };
+    const zkey_1 = { type: "mem" };
+    const zkey_final = { type: "mem" };
+
+    console.log('newZkey')
+    await snarkjs.zKey.newZKey(r1cs, ptau_final, zkey_0);
+
+    console.log('contribute')
+    await snarkjs.zKey.contribute(zkey_0, zkey_1, "p2_C1", "pa_Entropy1");
+
+    console.log('beacon')
+    await snarkjs.zKey.beacon(zkey_1, zkey_final, "B3", "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20", 10);
+
+    console.log('verifyFromR1cs')
+    const verifyFromR1csResult = await snarkjs.zKey.verifyFromR1cs(r1cs, ptau_final, zkey_final);
+    console.assert(verifyFromR1csResult);
+
+    console.log('verifyFromInit')
+    const verifyFromInit = await snarkjs.zKey.verifyFromInit(zkey_0, ptau_final, zkey_final);
+    console.assert(verifyFromInit);
+
+    console.log('exportVerificationKey')
+    const vKey = await snarkjs.zKey.exportVerificationKey(zkey_final)
+    await remix.call('fileManager', 'writeFile', './zk/build/verification_key.json', JSON.stringify(vKey))
+    
+    const templates = {
+      groth16: await remix.call('fileManager', 'readFile', 'templates/groth16_verifier.sol.ejs')
+    }
+    const solidityContract = await snarkjs.zKey.exportSolidityVerifier(zkey_final, templates)
+    
+    await remix.call('fileManager', 'writeFile', './zk/build/zk_verifier.sol', solidityContract)
+    
+    console.log('buffer', (zkey_final as any).data.length)
+    await remix.call('fileManager', 'writeFile', './zk/build/zk_setup.txt', JSON.stringify(Array.from(((zkey_final as any).data))))
+    
+    console.log('setup done.')
+    
+  } catch (e) {
+    console.error(e.message)
+  }
+})()
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_verification.ts b/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_verification.ts
new file mode 100644
index 0000000000..834ddf1081
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/scripts/run_verification.ts
@@ -0,0 +1,63 @@
+import { poseidon } from "circomlibjs" // v0.0.8
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const snarkjs = require('snarkjs');
+
+const logger = {
+  info: (...args) => console.log(...args),
+  debug: (...args) => console.log(...args),
+  error: (...args) => console.error(...args),
+}
+
+(async () => {
+  try {
+    // @ts-ignore
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash.r1cs', true);
+    // @ts-ignore
+    const r1cs = new Uint8Array(r1csBuffer);
+    // @ts-ignore
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/calculate_hash.wasm', true);
+    // @ts-ignore
+    const wasm = new Uint8Array(wasmBuffer);   
+     
+    const zkey_final = {
+      type: "mem",
+      data: new Uint8Array(JSON.parse(await remix.call('fileManager', 'readFile', './zk/build/zk_setup.txt')))
+    }
+    const wtns = { type: "mem" };   
+
+    const vKey = JSON.parse(await remix.call('fileManager', 'readFile', './zk/build/verification_key.json'))
+  
+    const value1 = '1234'
+    const value2 = '2'
+    const value3 = '3'
+    const value4 = '4'
+    
+    const wrongValue = '5' // put this in the poseidon hash calculation to simulate a non matching hash.
+
+    const signals = {
+      value1,
+      value2,
+      value3,
+      value4,
+      hash: poseidon([value1, value2, value3, value4])
+    }
+    
+    console.log('calculate')
+    await snarkjs.wtns.calculate(signals, wasm, wtns);
+    
+    console.log('check')
+    await snarkjs.wtns.check(r1cs, wtns, logger);
+    
+
+    console.log('prove')
+    const { proof, publicSignals } = await snarkjs.groth16.prove(zkey_final, wtns);
+    
+    const verified = await snarkjs.groth16.verify(vKey, publicSignals, proof, logger);
+    console.log('zk proof validity', verified);
+    
+    
+  } catch (e) {
+    console.error(e.message)
+  }
+})()
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/hashchecker/templates/groth16_verifier.sol.ejs b/libs/remix-ws-templates/src/templates/hashchecker/templates/groth16_verifier.sol.ejs
new file mode 100644
index 0000000000..692aedf612
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/hashchecker/templates/groth16_verifier.sol.ejs
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: GPL-3.0
+/*
+    Copyright 2021 0KIMS association.
+
+    This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
+
+    snarkJS is a free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    snarkJS is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+    License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+pragma solidity >=0.7.0 <0.9.0;
+
+contract Groth16Verifier {
+    // Scalar field size
+    uint256 constant r    = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
+    // Base field size
+    uint256 constant q   = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
+
+    // Verification Key data
+    uint256 constant alphax  = <%= vk_alpha_1[0]    %>;
+    uint256 constant alphay  = <%= vk_alpha_1[1]    %>;
+    uint256 constant betax1  = <%= vk_beta_2[0][1]  %>;
+    uint256 constant betax2  = <%= vk_beta_2[0][0]  %>;
+    uint256 constant betay1  = <%= vk_beta_2[1][1]  %>;
+    uint256 constant betay2  = <%= vk_beta_2[1][0]  %>;
+    uint256 constant gammax1 = <%= vk_gamma_2[0][1] %>;
+    uint256 constant gammax2 = <%= vk_gamma_2[0][0] %>;
+    uint256 constant gammay1 = <%= vk_gamma_2[1][1] %>;
+    uint256 constant gammay2 = <%= vk_gamma_2[1][0] %>;
+    uint256 constant deltax1 = <%= vk_delta_2[0][1] %>;
+    uint256 constant deltax2 = <%= vk_delta_2[0][0] %>;
+    uint256 constant deltay1 = <%= vk_delta_2[1][1] %>;
+    uint256 constant deltay2 = <%= vk_delta_2[1][0] %>;
+
+    <% for (let i=0; i<IC.length; i++) { %>
+    uint256 constant IC<%=i%>x = <%=IC[i][0]%>;
+    uint256 constant IC<%=i%>y = <%=IC[i][1]%>;
+    <% } %>
+ 
+    // Memory data
+    uint16 constant pVk = 0;
+    uint16 constant pPairing = 128;
+
+    uint16 constant pLastMem = 896;
+
+    function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[<%=IC.length-1%>] calldata _pubSignals) public view returns (bool) {
+        assembly {
+            function checkField(v) {
+                if iszero(lt(v, q)) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+            
+            // G1 function to multiply a G1 value(x,y) to value in an address
+            function g1_mulAccC(pR, x, y, s) {
+                let success
+                let mIn := mload(0x40)
+                mstore(mIn, x)
+                mstore(add(mIn, 32), y)
+                mstore(add(mIn, 64), s)
+
+                success := staticcall(sub(gas(), 2000), 7, mIn, 96, mIn, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+
+                mstore(add(mIn, 64), mload(pR))
+                mstore(add(mIn, 96), mload(add(pR, 32)))
+
+                success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+
+            function checkPairing(pA, pB, pC, pubSignals, pMem) -> isOk {
+                let _pPairing := add(pMem, pPairing)
+                let _pVk := add(pMem, pVk)
+
+                mstore(_pVk, IC0x)
+                mstore(add(_pVk, 32), IC0y)
+
+                // Compute the linear combination vk_x
+                <% for (let i = 1; i <= nPublic; i++) { %>
+                g1_mulAccC(_pVk, IC<%=i%>x, IC<%=i%>y, calldataload(add(pubSignals, <%=(i-1)*32%>)))
+                <% } %>
+
+                // -A
+                mstore(_pPairing, calldataload(pA))
+                mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q))
+
+                // B
+                mstore(add(_pPairing, 64), calldataload(pB))
+                mstore(add(_pPairing, 96), calldataload(add(pB, 32)))
+                mstore(add(_pPairing, 128), calldataload(add(pB, 64)))
+                mstore(add(_pPairing, 160), calldataload(add(pB, 96)))
+
+                // alpha1
+                mstore(add(_pPairing, 192), alphax)
+                mstore(add(_pPairing, 224), alphay)
+
+                // beta2
+                mstore(add(_pPairing, 256), betax1)
+                mstore(add(_pPairing, 288), betax2)
+                mstore(add(_pPairing, 320), betay1)
+                mstore(add(_pPairing, 352), betay2)
+
+                // vk_x
+                mstore(add(_pPairing, 384), mload(add(pMem, pVk)))
+                mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32))))
+
+
+                // gamma2
+                mstore(add(_pPairing, 448), gammax1)
+                mstore(add(_pPairing, 480), gammax2)
+                mstore(add(_pPairing, 512), gammay1)
+                mstore(add(_pPairing, 544), gammay2)
+
+                // C
+                mstore(add(_pPairing, 576), calldataload(pC))
+                mstore(add(_pPairing, 608), calldataload(add(pC, 32)))
+
+                // delta2
+                mstore(add(_pPairing, 640), deltax1)
+                mstore(add(_pPairing, 672), deltax2)
+                mstore(add(_pPairing, 704), deltay1)
+                mstore(add(_pPairing, 736), deltay2)
+
+
+                let success := staticcall(sub(gas(), 2000), 8, _pPairing, 768, _pPairing, 0x20)
+
+                isOk := and(success, mload(_pPairing))
+            }
+
+            let pMem := mload(0x40)
+            mstore(0x40, add(pMem, pLastMem))
+
+            // Validate that all evaluations ∈ F
+            <% for (let i=0; i<IC.length; i++) { %>
+            checkField(calldataload(add(_pubSignals, <%=i*32%>)))
+            <% } %>
+
+            // Validate all evaluations
+            let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem)
+
+            mstore(0, isValid)
+             return(0, 0x20)
+         }
+     }
+ }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/LICENSE-APACHE b/libs/remix-ws-templates/src/templates/rln/LICENSE-APACHE
new file mode 100644
index 0000000000..261eeb9e9f
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/LICENSE-APACHE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/libs/remix-ws-templates/src/templates/rln/LICENSE-MIT b/libs/remix-ws-templates/src/templates/rln/LICENSE-MIT
new file mode 100644
index 0000000000..489fcb5103
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/LICENSE-MIT
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Rate-Limiting Nullifier (RLN)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/libs/remix-ws-templates/src/templates/rln/README.md b/libs/remix-ws-templates/src/templates/rln/README.md
new file mode 100644
index 0000000000..0b0bdf6ff9
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/README.md
@@ -0,0 +1,26 @@
+<h1 align=center>Rate-Limiting Nullifier circuits in Circom</h1>
+<p align="center">
+    <img src="https://github.com/Rate-Limiting-Nullifier/rln-circuits-v2/workflows/Test/badge.svg" width="110">
+</p>
+
+<div align="center">
+
+*The project was audited by Veridise, yAcademy fellows and internally.*
+
+</div>
+
+___
+
+## What's RLN?
+
+RLN is a zero-knowledge gadget that enables spam 
+prevention in anonymous environments.
+
+The core parts of RLN are:
+* zk-circuits in Circom (this repo);
+* [registry smart-contract](https://github.com/Rate-Limiting-Nullifier/rln-contract);
+* set of libraries to build app with RLN ([rlnjs](https://github.com/Rate-Limiting-Nullifier/rlnjs), [zerokit](https://github.com/vacp2p/zerokit)).
+
+---
+
+To learn more on RLN and how it works - check out [documentation](https://rate-limiting-nullifier.github.io/rln-docs/).
diff --git a/libs/remix-ws-templates/src/templates/rln/circuits/rln.circom b/libs/remix-ws-templates/src/templates/rln/circuits/rln.circom
new file mode 100644
index 0000000000..94fc59024f
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/circuits/rln.circom
@@ -0,0 +1,40 @@
+pragma circom 2.1.0;
+
+include "./utils.circom";
+include "circomlib/poseidon.circom";
+
+template RLN(DEPTH, LIMIT_BIT_SIZE) {
+    // Private signals
+    signal input identitySecret;
+    signal input userMessageLimit;
+    signal input messageId;
+    signal input pathElements[DEPTH];
+    signal input identityPathIndex[DEPTH];
+
+    // Public signals
+    signal input x;
+    signal input externalNullifier;
+
+    // Outputs
+    signal output y;
+    signal output root;
+    signal output nullifier;
+
+    signal identityCommitment <== Poseidon(1)([identitySecret]);
+    signal rateCommitment <== Poseidon(2)([identityCommitment, userMessageLimit]);
+
+    // Membership check
+    root <== MerkleTreeInclusionProof(DEPTH)(rateCommitment, identityPathIndex, pathElements);
+
+    // messageId range check
+    RangeCheck(LIMIT_BIT_SIZE)(messageId, userMessageLimit);
+
+    // SSS share calculations
+    signal a1 <== Poseidon(3)([identitySecret, externalNullifier, messageId]);
+    y <== identitySecret + a1 * x;
+
+    // nullifier calculation
+    nullifier <== Poseidon(1)([a1]);
+}
+
+component main { public [x, externalNullifier] } = RLN(20, 16);
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/circuits/utils.circom b/libs/remix-ws-templates/src/templates/rln/circuits/utils.circom
new file mode 100644
index 0000000000..788e3a4987
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/circuits/utils.circom
@@ -0,0 +1,45 @@
+pragma circom 2.1.0;
+
+include "circomlib/poseidon.circom";
+include "circomlib/mux1.circom";
+include "circomlib/bitify.circom";
+include "circomlib/comparators.circom";
+
+template MerkleTreeInclusionProof(DEPTH) {
+    signal input leaf;
+    signal input pathIndex[DEPTH];
+    signal input pathElements[DEPTH];
+
+    signal output root;
+
+    signal mux[DEPTH][2];
+    signal levelHashes[DEPTH + 1];
+    
+    levelHashes[0] <== leaf;
+    for (var i = 0; i < DEPTH; i++) {
+        pathIndex[i] * (pathIndex[i] - 1) === 0;
+
+        mux[i] <== MultiMux1(2)(
+            [
+                [levelHashes[i], pathElements[i]], 
+                [pathElements[i], levelHashes[i]]
+            ], 
+            pathIndex[i]
+        );
+
+        levelHashes[i + 1] <== Poseidon(2)([mux[i][0], mux[i][1]]);
+    }
+
+    root <== levelHashes[DEPTH];
+}
+
+template RangeCheck(LIMIT_BIT_SIZE) {
+    assert(LIMIT_BIT_SIZE < 253);
+
+    signal input messageId;
+    signal input limit;
+
+    signal bitCheck[LIMIT_BIT_SIZE] <== Num2Bits(LIMIT_BIT_SIZE)(messageId);
+    signal rangeCheck <== LessThan(LIMIT_BIT_SIZE)([messageId, limit]);
+    rangeCheck === 1;
+}
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/circuits/withdraw.circom b/libs/remix-ws-templates/src/templates/rln/circuits/withdraw.circom
new file mode 100644
index 0000000000..3eae931e1d
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/circuits/withdraw.circom
@@ -0,0 +1,15 @@
+pragma circom 2.1.0;
+
+include "circomlib/poseidon.circom";
+
+template Withdraw() {
+    signal input identitySecret;
+    signal input address;
+
+    signal output identityCommitment <== Poseidon(1)([identitySecret]);
+
+    // Dummy constraint to prevent compiler optimizing it
+    signal addressSquared <== address * address;
+}
+
+component main { public [address] } = Withdraw();
diff --git a/libs/remix-ws-templates/src/templates/rln/index.ts b/libs/remix-ws-templates/src/templates/rln/index.ts
new file mode 100644
index 0000000000..92e290ccc3
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/index.ts
@@ -0,0 +1,22 @@
+export default async () => {
+  return {
+    // @ts-ignore
+    'circuits/rln.circom': (await import('raw-loader!./circuits/rln.circom')).default,
+    // @ts-ignore
+    'circuits/utils.circom': (await import('!!raw-loader!./circuits/utils.circom')).default,
+    // @ts-ignore
+    'circuits/withdraw.circom': (await import('!!raw-loader!./circuits/withdraw.circom')).default,
+    // @ts-ignore
+    'scripts/run_setup.ts': (await import('!!raw-loader!./scripts/run_setup.ts')).default,
+    // @ts-ignore
+    'scripts/run_verification.ts': (await import('!!raw-loader!./scripts/run_verification.ts')).default,
+    // @ts-ignore
+    'templates/groth16_verifier.sol.ejs': (await import('!!raw-loader!./templates/groth16_verifier.sol.ejs')).default,
+    // @ts-ignore
+    'LICENSE-APACHE': (await import('!!raw-loader!./LICENSE-APACHE')).default,
+    // @ts-ignore
+    'LICENSE-MIT': (await import('!!raw-loader!./LICENSE-MIT')).default,
+    // @ts-ignore
+    'README.md': (await import('raw-loader!./README.md')).default
+  }
+}
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/scripts/run_setup.ts b/libs/remix-ws-templates/src/templates/rln/scripts/run_setup.ts
new file mode 100644
index 0000000000..2f9e9684cf
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/scripts/run_setup.ts
@@ -0,0 +1,59 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const snarkjs = require('snarkjs');
+
+const logger = {
+  info: (...args) => console.log(...args),
+  debug: (...args) => console.log(...args)
+};
+
+(async () => {
+  try {
+    // @ts-ignore
+    await remix.call('circuit-compiler', 'generateR1cs', 'circuits/rln.circom');
+
+    const ptau_final = "https://ipfs-cluster.ethdevops.io/ipfs/QmTiT4eiYz5KF7gQrDsgfCSTRv3wBPYJ4bRN1MmTRshpnW";
+    // @ts-ignore
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln.r1cs', true);
+    // @ts-ignore
+    const r1cs = new Uint8Array(r1csBuffer);
+    const zkey_0 = { type: "mem" };
+    const zkey_1 = { type: "mem" };
+    const zkey_final = { type: "mem" };
+
+    console.log('newZkey')
+    await snarkjs.zKey.newZKey(r1cs, ptau_final, zkey_0);
+
+    console.log('contribute')
+    await snarkjs.zKey.contribute(zkey_0, zkey_1, "p2_C1", "pa_Entropy1");
+
+    console.log('beacon')
+    await snarkjs.zKey.beacon(zkey_1, zkey_final, "B3", "0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20", 10);
+
+    console.log('verifyFromR1cs')
+    const verifyFromR1csResult = await snarkjs.zKey.verifyFromR1cs(r1cs, ptau_final, zkey_final);
+    console.assert(verifyFromR1csResult);
+
+    console.log('verifyFromInit')
+    const verifyFromInit = await snarkjs.zKey.verifyFromInit(zkey_0, ptau_final, zkey_final);
+    console.assert(verifyFromInit);
+
+    console.log('exportVerificationKey')
+    const vKey = await snarkjs.zKey.exportVerificationKey(zkey_final)
+    await remix.call('fileManager', 'writeFile', './zk/build/verification_key.json', JSON.stringify(vKey))
+    
+    const templates = {
+      groth16: await remix.call('fileManager', 'readFile', 'templates/groth16_verifier.sol.ejs')
+    }
+    const solidityContract = await snarkjs.zKey.exportSolidityVerifier(zkey_final, templates)
+    
+    await remix.call('fileManager', 'writeFile', './zk/build/zk_verifier.sol', solidityContract)
+    
+    console.log('buffer', (zkey_final as any).data.length)
+    await remix.call('fileManager', 'writeFile', './zk/build/zk_setup.txt', JSON.stringify(Array.from(((zkey_final as any).data))))
+    
+    console.log('setup done.')
+    
+  } catch (e) {
+    console.error(e.message)
+  }
+})()
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/scripts/run_verification.ts b/libs/remix-ws-templates/src/templates/rln/scripts/run_verification.ts
new file mode 100644
index 0000000000..61771faad8
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/scripts/run_verification.ts
@@ -0,0 +1,141 @@
+import { ethers, BigNumber } from 'ethers'
+import { IncrementalMerkleTree } from "@zk-kit/incremental-merkle-tree"
+import { poseidon } from "circomlibjs" // v0.0.8
+
+import { ZqField } from 'ffjavascript'
+const SNARK_FIELD_SIZE = BigInt('21888242871839275222246405745257275088548364400416034343698204186575808495617')
+
+// Creates the finite field
+const Fq = new ZqField(SNARK_FIELD_SIZE)
+
+// eslint-disable-next-line @typescript-eslint/no-var-requires
+const snarkjs = require('snarkjs');
+
+const logger = {
+  info: (...args) => console.log(...args),
+  debug: (...args) => console.log(...args),
+  error: (...args) => console.error(...args),
+}
+
+/**
+ * Recovers secret from two shares
+ * @param x1 signal hash of first message
+ * @param x2 signal hash of second message
+ * @param y1 yshare of first message
+ * @param y2 yshare of second message
+ * @returns identity secret
+ */
+function shamirRecovery(x1: bigint, x2: bigint, y1: bigint, y2: bigint): bigint {
+  const slope = Fq.div(Fq.sub(y2, y1), Fq.sub(x2, x1))
+  const privateKey = Fq.sub(y1, Fq.mul(slope, x1))
+
+  return Fq.normalize(privateKey)
+}
+
+function hash(message: any): bigint {
+  message = BigNumber.from(message).toTwos(256).toHexString()
+  message = ethers.utils.zeroPad(message, 32)
+  return BigInt(ethers.utils.keccak256(message)) >> BigInt(8)
+}
+
+function hashNullifier(message: any): bigint {
+  return BigInt(ethers.utils.keccak256(message)) >> BigInt(8)
+}
+
+async function prove (signals, wasm, wtns, r1cs, zkey_final, vKey) {
+  console.log('calculate')
+  await snarkjs.wtns.calculate(signals, wasm, wtns);
+  
+  console.log('check')
+  await snarkjs.wtns.check(r1cs, wtns, logger);  
+
+  console.log('prove')
+  const { proof, publicSignals } = await snarkjs.groth16.prove(zkey_final, wtns);
+  
+  const verified = await snarkjs.groth16.verify(vKey, publicSignals, proof, logger);
+  console.log('zk proof validity', verified);
+  return {
+    proof,
+    x: publicSignals[3],
+    y: publicSignals[0]
+  }
+}
+
+(async () => {
+  try {
+    // @ts-ignore
+    const r1csBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln.r1cs', true);
+    // @ts-ignore
+    const r1cs = new Uint8Array(r1csBuffer);
+    // @ts-ignore
+    const wasmBuffer = await remix.call('fileManager', 'readFile', 'circuits/.bin/rln.wasm', true);
+    // @ts-ignore
+    const wasm = new Uint8Array(wasmBuffer);   
+     
+    const zkey_final = {
+      type: "mem",
+      data: new Uint8Array(JSON.parse(await remix.call('fileManager', 'readFile', './zk/build/zk_setup.txt')))
+    }
+    const wtns = { type: "mem" };   
+
+    const vKey = JSON.parse(await remix.call('fileManager', 'readFile', './zk/build/verification_key.json'))
+  
+    // build list of identity commitments
+    const secrets = []
+    const identityCommitments = []
+    const rateCommitments = []
+    const userMessageLimit = 0x2
+    for (let k = 0; k < 2; k++) {      
+      const identitySecret = BigInt(ethers.utils.hexlify(ethers.utils.randomBytes(32)))
+      secrets.push(identitySecret)
+  
+      const identityCommitment = poseidon([identitySecret])
+      const rateCommitment = poseidon([identityCommitment, userMessageLimit])
+      identityCommitments.push(identityCommitment)
+      rateCommitments.push(rateCommitment)
+    }
+    
+    let tree
+  
+    try {
+      tree = new IncrementalMerkleTree(poseidon, 20, BigInt(0), 2, rateCommitments) // Binary tree.
+    } catch (e) {
+      console.error(e.message)
+      return
+    }
+
+    const merkleproof1 = tree.createProof(0)
+
+    const appId = 0xa
+    const epoch = 0x1
+
+    const signals1 = {
+      identitySecret: secrets[0],
+      userMessageLimit,
+      messageId: 0x0,
+      pathElements: merkleproof1.siblings,
+      identityPathIndex: merkleproof1.pathIndices,
+      x: 0xabcd, // hash(message)
+      externalNullifier: 0xa // hash(epoch, appId)
+    }
+    const proof1 = await prove(signals1, wasm, wtns, r1cs, zkey_final, vKey)
+
+    const signals2 = {
+      identitySecret: secrets[0],
+      userMessageLimit,
+      messageId: 0x0,
+      pathElements: merkleproof1.siblings,
+      identityPathIndex: merkleproof1.pathIndices,
+      x: 0xabce, // hash(message)
+      externalNullifier: 0xa // hash(epoch, appId)
+    }
+    const proof2 = await prove(signals2, wasm, wtns, r1cs, zkey_final, vKey)
+
+    const secret = shamirRecovery(BigInt(proof1.x), BigInt(proof2.x), BigInt(proof1.y), BigInt(proof2.y))
+
+    console.log(secret.toString(10))
+    console.log(Fq.normalize(secrets[0]))
+  } catch (e) {
+    console.error(e.message)
+  }
+})()
\ No newline at end of file
diff --git a/libs/remix-ws-templates/src/templates/rln/templates/groth16_verifier.sol.ejs b/libs/remix-ws-templates/src/templates/rln/templates/groth16_verifier.sol.ejs
new file mode 100644
index 0000000000..692aedf612
--- /dev/null
+++ b/libs/remix-ws-templates/src/templates/rln/templates/groth16_verifier.sol.ejs
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: GPL-3.0
+/*
+    Copyright 2021 0KIMS association.
+
+    This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
+
+    snarkJS is a free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    snarkJS is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+    or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+    License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
+*/
+
+pragma solidity >=0.7.0 <0.9.0;
+
+contract Groth16Verifier {
+    // Scalar field size
+    uint256 constant r    = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
+    // Base field size
+    uint256 constant q   = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
+
+    // Verification Key data
+    uint256 constant alphax  = <%= vk_alpha_1[0]    %>;
+    uint256 constant alphay  = <%= vk_alpha_1[1]    %>;
+    uint256 constant betax1  = <%= vk_beta_2[0][1]  %>;
+    uint256 constant betax2  = <%= vk_beta_2[0][0]  %>;
+    uint256 constant betay1  = <%= vk_beta_2[1][1]  %>;
+    uint256 constant betay2  = <%= vk_beta_2[1][0]  %>;
+    uint256 constant gammax1 = <%= vk_gamma_2[0][1] %>;
+    uint256 constant gammax2 = <%= vk_gamma_2[0][0] %>;
+    uint256 constant gammay1 = <%= vk_gamma_2[1][1] %>;
+    uint256 constant gammay2 = <%= vk_gamma_2[1][0] %>;
+    uint256 constant deltax1 = <%= vk_delta_2[0][1] %>;
+    uint256 constant deltax2 = <%= vk_delta_2[0][0] %>;
+    uint256 constant deltay1 = <%= vk_delta_2[1][1] %>;
+    uint256 constant deltay2 = <%= vk_delta_2[1][0] %>;
+
+    <% for (let i=0; i<IC.length; i++) { %>
+    uint256 constant IC<%=i%>x = <%=IC[i][0]%>;
+    uint256 constant IC<%=i%>y = <%=IC[i][1]%>;
+    <% } %>
+ 
+    // Memory data
+    uint16 constant pVk = 0;
+    uint16 constant pPairing = 128;
+
+    uint16 constant pLastMem = 896;
+
+    function verifyProof(uint[2] calldata _pA, uint[2][2] calldata _pB, uint[2] calldata _pC, uint[<%=IC.length-1%>] calldata _pubSignals) public view returns (bool) {
+        assembly {
+            function checkField(v) {
+                if iszero(lt(v, q)) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+            
+            // G1 function to multiply a G1 value(x,y) to value in an address
+            function g1_mulAccC(pR, x, y, s) {
+                let success
+                let mIn := mload(0x40)
+                mstore(mIn, x)
+                mstore(add(mIn, 32), y)
+                mstore(add(mIn, 64), s)
+
+                success := staticcall(sub(gas(), 2000), 7, mIn, 96, mIn, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+
+                mstore(add(mIn, 64), mload(pR))
+                mstore(add(mIn, 96), mload(add(pR, 32)))
+
+                success := staticcall(sub(gas(), 2000), 6, mIn, 128, pR, 64)
+
+                if iszero(success) {
+                    mstore(0, 0)
+                    return(0, 0x20)
+                }
+            }
+
+            function checkPairing(pA, pB, pC, pubSignals, pMem) -> isOk {
+                let _pPairing := add(pMem, pPairing)
+                let _pVk := add(pMem, pVk)
+
+                mstore(_pVk, IC0x)
+                mstore(add(_pVk, 32), IC0y)
+
+                // Compute the linear combination vk_x
+                <% for (let i = 1; i <= nPublic; i++) { %>
+                g1_mulAccC(_pVk, IC<%=i%>x, IC<%=i%>y, calldataload(add(pubSignals, <%=(i-1)*32%>)))
+                <% } %>
+
+                // -A
+                mstore(_pPairing, calldataload(pA))
+                mstore(add(_pPairing, 32), mod(sub(q, calldataload(add(pA, 32))), q))
+
+                // B
+                mstore(add(_pPairing, 64), calldataload(pB))
+                mstore(add(_pPairing, 96), calldataload(add(pB, 32)))
+                mstore(add(_pPairing, 128), calldataload(add(pB, 64)))
+                mstore(add(_pPairing, 160), calldataload(add(pB, 96)))
+
+                // alpha1
+                mstore(add(_pPairing, 192), alphax)
+                mstore(add(_pPairing, 224), alphay)
+
+                // beta2
+                mstore(add(_pPairing, 256), betax1)
+                mstore(add(_pPairing, 288), betax2)
+                mstore(add(_pPairing, 320), betay1)
+                mstore(add(_pPairing, 352), betay2)
+
+                // vk_x
+                mstore(add(_pPairing, 384), mload(add(pMem, pVk)))
+                mstore(add(_pPairing, 416), mload(add(pMem, add(pVk, 32))))
+
+
+                // gamma2
+                mstore(add(_pPairing, 448), gammax1)
+                mstore(add(_pPairing, 480), gammax2)
+                mstore(add(_pPairing, 512), gammay1)
+                mstore(add(_pPairing, 544), gammay2)
+
+                // C
+                mstore(add(_pPairing, 576), calldataload(pC))
+                mstore(add(_pPairing, 608), calldataload(add(pC, 32)))
+
+                // delta2
+                mstore(add(_pPairing, 640), deltax1)
+                mstore(add(_pPairing, 672), deltax2)
+                mstore(add(_pPairing, 704), deltay1)
+                mstore(add(_pPairing, 736), deltay2)
+
+
+                let success := staticcall(sub(gas(), 2000), 8, _pPairing, 768, _pPairing, 0x20)
+
+                isOk := and(success, mload(_pPairing))
+            }
+
+            let pMem := mload(0x40)
+            mstore(0x40, add(pMem, pLastMem))
+
+            // Validate that all evaluations ∈ F
+            <% for (let i=0; i<IC.length; i++) { %>
+            checkField(calldataload(add(_pubSignals, <%=i*32%>)))
+            <% } %>
+
+            // Validate all evaluations
+            let isValid := checkPairing(_pA, _pB, _pC, _pubSignals, pMem)
+
+            mstore(0, isValid)
+             return(0, 0x20)
+         }
+     }
+ }
\ No newline at end of file
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index a0e5ca54fd..64393e4fb1 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.19",
+  "version": "0.6.20",
   "description": "remix server: allow accessing file system from remix.ethereum.org and start a dev environment (see help section)",
   "main": "index.js",
   "types": "./index.d.ts",
diff --git a/mock-serve-data.json b/mock-serve-data.json
new file mode 100644
index 0000000000..a734e6acf7
--- /dev/null
+++ b/mock-serve-data.json
@@ -0,0 +1,7 @@
+{
+  "/infer": {
+      "post": {
+          "data": "testing data"
+      }
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 0fc6088543..bdb5eeb02d 100644
--- a/package.json
+++ b/package.json
@@ -145,6 +145,7 @@
     "@types/nightwatch": "^2.3.1",
     "@web3modal/ethereum": "^2.7.1",
     "@web3modal/react": "^2.6.2",
+    "@xenova/transformers": "^2.7.0",
     "ansi-gray": "^0.1.1",
     "assert": "^2.1.0",
     "async": "^2.6.2",
@@ -181,7 +182,7 @@
     "http-server": "^14.1.1",
     "intro.js": "^4.1.0",
     "isbinaryfile": "^3.0.2",
-    "isomorphic-git": "^1.24.0",
+    "isomorphic-git": "^1.25.0",
     "jquery": "^3.3.1",
     "js-yaml": "^4.1.0",
     "jspdf": "^2.5.1",
diff --git a/release-process.md b/release-process.md
index fe0df91b28..a427255efc 100644
--- a/release-process.md
+++ b/release-process.md
@@ -17,10 +17,16 @@ Once feature freeze is done, `remix_beta` should be updated latest to the master
  - `git push -f origin remix_beta`
  
 ## Testing
-Testing is performed after the Feature Freeze on `remix-beta.ethereum.org`. `build-qa-doc.js` script can be used to generate the list of QA tasks. Instructions to use the file are given in the file itself: https://github.com/ethereum/remix-project/blob/master/build-qa-doc.js#L18 . 
+Testing is performed after the Feature Freeze on `remix-beta.ethereum.org`. `build-qa-doc.js` script can be used to generate the list of QA tasks. Instructions to use the file are given in the file itself: https://github.com/ethereum/remix-project/blob/master/build-qa-doc.js#L18 
 
 Once ready to run, it can be run using the Node.js: `node build-qa-doc.js`
 
+Find out the four release highlights and update in this file: `remix-project/apps/remix-ide/src/app/tabs/locales/en/homeReleaseDetails.json` along with the version in `title` string
+
+Update the GitHub release link in this file: `remix-project/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx` at line 44 & 63
+
+This will set latest release details in the first slide of `Featured` section.
+
 ## remixd NPM release
 Once testing is completed, release will start by publishing `remixd`.if required, `remixd` can be also released individually
 
@@ -41,7 +47,9 @@ This command uses `lerna` and is solely responsible for publishing all the remix
 Once this command has been run, the versions for each remix library will be updated to latest in the libs' package.json file.
  - Create and merge bump PR to master
  
-## Remix IDE Release 
+## Remix IDE Release
+Make sure release highlights and full changelog link is updated to show them on Home tab.
+
 ### Part 1. Bump the version and update Beta
 
 #### Make sure `remix_beta` is up-to-date with `master` branch:
@@ -64,8 +72,7 @@ Once this command has been run, the versions for each remix library will be upda
  - `git pull origin remix_beta`
  - Create tag: `git tag v<version-number>`, `<version-number>` should be same as in package.json of `remix_beta` branch
  - Push tag: `git push --tags`
- - Generate changelog using `build-changelog.js` script as described in the script itself
- - Publish a release in GitHub using the generated changelog
+ - Publish a new release on GitHub and generate automated changelog by selecting the appropriate tag
 
 ### Part 2. Update the Remix Live
 
diff --git a/yarn.lock b/yarn.lock
index aed6b5ea8e..d9879bd417 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -67,6 +67,14 @@
   dependencies:
     "@babel/highlight" "^7.16.0"
 
+"@babel/code-frame@^7.22.13":
+  version "7.22.13"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+  integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
+  dependencies:
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
+
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8", "@babel/compat-data@^7.19.1":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.1.tgz#72d647b4ff6a4f82878d184613353af1dd0290f9"
@@ -180,7 +188,7 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.15.8", "@babel/generator@^7.21.0", "@babel/generator@^7.21.1", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
+"@babel/generator@^7.15.8", "@babel/generator@^7.21.0", "@babel/generator@^7.4.0", "@babel/generator@^7.7.2":
   version "7.21.1"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
   integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
@@ -190,24 +198,6 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.16.0":
-  version "7.16.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.5.tgz#26e1192eb8f78e0a3acaf3eede3c6fc96d22bedf"
-  integrity sha512-kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA==
-  dependencies:
-    "@babel/types" "^7.16.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.19.0":
-  version "7.19.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.0.tgz#785596c06425e59334df2ccee63ab166b738419a"
-  integrity sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==
-  dependencies:
-    "@babel/types" "^7.19.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.19.3":
   version "7.19.3"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.3.tgz#d7f4d1300485b4547cb6f94b27d10d237b42bf59"
@@ -226,6 +216,16 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.3.tgz#86e6e83d95903fbe7613f448613b8b319f330a8e"
+  integrity sha512-keeZWAV4LU3tW0qRi19HRpabC/ilM0HRBBzf9/k8FFiG4KVpiv0FIy4hHfLfFQZNhziCTPTmd59zoyv6DNISzg==
+  dependencies:
+    "@babel/types" "^7.23.3"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d"
@@ -337,6 +337,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
+  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
@@ -361,13 +366,13 @@
     "@babel/template" "^7.18.10"
     "@babel/types" "^7.19.0"
 
-"@babel/helper-function-name@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
-  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
+"@babel/helper-function-name@^7.23.0":
+  version "7.23.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
+  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
   dependencies:
-    "@babel/template" "^7.20.7"
-    "@babel/types" "^7.21.0"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
 "@babel/helper-get-function-arity@^7.16.0":
   version "7.16.0"
@@ -376,13 +381,6 @@
   dependencies:
     "@babel/types" "^7.16.0"
 
-"@babel/helper-hoist-variables@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz#4c9023c2f1def7e28ff46fc1dbcd36a39beaa81a"
-  integrity sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==
-  dependencies:
-    "@babel/types" "^7.16.0"
-
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
@@ -390,6 +388,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-hoist-variables@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-member-expression-to-functions@^7.16.0":
   version "7.16.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.0.tgz#29287040efd197c77636ef75188e81da8bccd5a4"
@@ -583,6 +588,13 @@
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-split-export-declaration@^7.22.6":
+  version "7.22.6"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+  dependencies:
+    "@babel/types" "^7.22.5"
+
 "@babel/helper-string-parser@^7.18.10":
   version "7.18.10"
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
@@ -598,6 +610,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
   integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
 
+"@babel/helper-string-parser@^7.22.5":
+  version "7.22.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+  integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
 "@babel/helper-validator-identifier@^7.15.7":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
@@ -608,6 +625,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
   integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
 
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
@@ -668,22 +690,31 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
+"@babel/highlight@^7.22.13":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.20.tgz#4ca92b71d80554b01427815e06f2df965b9c1f54"
+  integrity sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
 "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.21.0", "@babel/parser@^7.7.0":
   version "7.21.1"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.1.tgz#a8f81ee2fe872af23faea4b17a08fcc869de7bcc"
   integrity sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg==
 
-"@babel/parser@^7.15.8", "@babel/parser@^7.21.2", "@babel/parser@^7.4.3":
+"@babel/parser@^7.15.8", "@babel/parser@^7.4.3":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.2.tgz#dacafadfc6d7654c3051a66d6fe55b6cb2f2a0b3"
   integrity sha512-URpaIJQwEkEC2T9Kn+Ai6Xe/02iNaVCuT/PtoRz3GPVJVDpPd7mLo+VddTbhCRU9TXqW5mSrQfXZyi8kDKOVpQ==
 
-"@babel/parser@^7.16.0", "@babel/parser@^7.16.3":
+"@babel/parser@^7.16.0":
   version "7.16.6"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.16.6.tgz#8f194828193e8fa79166f34a4b4e52f3e769a314"
   integrity sha512-Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ==
 
-"@babel/parser@^7.18.10", "@babel/parser@^7.19.1":
+"@babel/parser@^7.18.10":
   version "7.19.1"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.1.tgz#6f6d6c2e621aad19a92544cc217ed13f1aac5b4c"
   integrity sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==
@@ -698,6 +729,11 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8"
   integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==
 
+"@babel/parser@^7.22.15", "@babel/parser@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.3.tgz#0ce0be31a4ca4f1884b5786057cadcb6c3be58f9"
+  integrity sha512-uVsWNvlVsIninV2prNz/3lHCb+5CJ+e+IUBfbjToAHODtfGYLfCFuY4AU7TskI+dAKk+njsPiBjq1gKTvZOBaw==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -1675,98 +1711,28 @@
     "@babel/parser" "^7.18.10"
     "@babel/types" "^7.18.10"
 
-"@babel/traverse@^7.15.4", "@babel/traverse@^7.21.2", "@babel/traverse@^7.4.3":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.2.tgz#ac7e1f27658750892e815e60ae90f382a46d8e75"
-  integrity sha512-ts5FFU/dSUPS13tv8XiEObDu9K+iagEKME9kAbaP7r0Y9KtZJZ+NGndDvWoRAYNpeWafbpFeki3q9QoMD6gxyw==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.1"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.2"
-    "@babel/types" "^7.21.2"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.16.0":
-  version "7.16.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.16.3.tgz#f63e8a938cc1b780f66d9ed3c54f532ca2d14787"
-  integrity sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    "@babel/generator" "^7.16.0"
-    "@babel/helper-function-name" "^7.16.0"
-    "@babel/helper-hoist-variables" "^7.16.0"
-    "@babel/helper-split-export-declaration" "^7.16.0"
-    "@babel/parser" "^7.16.3"
-    "@babel/types" "^7.16.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1":
-  version "7.19.1"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.1.tgz#0fafe100a8c2a603b4718b1d9bf2568d1d193347"
-  integrity sha512-0j/ZfZMxKukDaag2PtOPDbwuELqIar6lLskVPPJDjXMXjfLb1Obo/1yjxIGqqAJrmfaTIY3z2wFLAQ7qSkLsuA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.1"
-    "@babel/types" "^7.19.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.3":
-  version "7.19.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.3.tgz#3a3c5348d4988ba60884e8494b0592b2f15a04b4"
-  integrity sha512-qh5yf6149zhq2sgIXmwjnsvmnNQC2iw70UFjp4olxucKrWd/dvlUsBI88VSLUsnMNF7/vnOiA+nk1+yLoCqROQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.3"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.3"
-    "@babel/types" "^7.19.3"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6":
-  version "7.19.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc"
-  integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.19.6"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.19.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.19.6"
-    "@babel/types" "^7.19.4"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.21.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.0.tgz#0e1807abd5db98e6a19c204b80ed1e3f5bca0edc"
-  integrity sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.0"
-    "@babel/types" "^7.21.0"
+"@babel/template@^7.22.15":
+  version "7.22.15"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
+  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
+
+"@babel/traverse@^7.15.4", "@babel/traverse@^7.16.0", "@babel/traverse@^7.19.0", "@babel/traverse@^7.19.1", "@babel/traverse@^7.19.3", "@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.4.3", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.3.tgz#26ee5f252e725aa7aca3474aa5b324eaf7908b5b"
+  integrity sha512-+K0yF1/9yR0oHdE0StHuEj3uTPzwwbrLGfNOndVJVV2TqA5+j3oljJUb4nmB954FLGjNem976+B+eDuLIjesiQ==
+  dependencies:
+    "@babel/code-frame" "^7.22.13"
+    "@babel/generator" "^7.23.3"
+    "@babel/helper-environment-visitor" "^7.22.20"
+    "@babel/helper-function-name" "^7.23.0"
+    "@babel/helper-hoist-variables" "^7.22.5"
+    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/parser" "^7.23.3"
+    "@babel/types" "^7.23.3"
     debug "^4.1.0"
     globals "^11.1.0"
 
@@ -1841,6 +1807,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.3":
+  version "7.23.3"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.3.tgz#d5ea892c07f2ec371ac704420f4dcdb07b5f9598"
+  integrity sha512-OZnvoH2l8PK5eUvEcUyCt/sXgr/h+UWpVuBbOljwcrAgUl6lpchoQ++PHGyQy1AtYnVA6CEq3y5xeEI10brpXw==
+  dependencies:
+    "@babel/helper-string-parser" "^7.22.5"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -2892,6 +2867,11 @@
     unique-filename "^1.1.1"
     which "^1.3.1"
 
+"@fastify/busboy@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.0.0.tgz#f22824caff3ae506b18207bad4126dbc6ccdb6b8"
+  integrity sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==
+
 "@formatjs/ecma402-abstract@1.11.7":
   version "1.11.7"
   resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.11.7.tgz#47f1a854f679f813d9baa1ee55adae94880ec706"
@@ -4918,6 +4898,59 @@
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590"
   integrity sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==
+
+"@protobufjs/utf8@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
+  integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
+
 "@puppeteer/browsers@^1.5.0":
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-1.6.0.tgz#d52413a7039e40a5ef72fb13fb6505fd87ce842e"
@@ -5960,6 +5993,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.176.tgz#641150fc1cda36fbfa329de603bbb175d7ee20c0"
   integrity sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==
 
+"@types/long@^4.0.1":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
+  integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
+
 "@types/lru-cache@5.1.1", "@types/lru-cache@^5.1.0":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef"
@@ -6016,6 +6054,13 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.9.5.tgz#162b864bc70be077e6db212b322754917929e976"
   integrity sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==
 
+"@types/node@>=13.7.0":
+  version "20.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.0.tgz#bfcdc230583aeb891cf51e73cfdaacdd8deae298"
+  integrity sha512-nekiGu2NDb1BcVofVcEKMIwzlx4NjHlcjhoxxKBNLtz15Y1z7MYf549DFvkHSId02Ax6kGwWntIBPC3l/JZcmw==
+  dependencies:
+    undici-types "~5.26.4"
+
 "@types/node@^12.12.54":
   version "12.20.55"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
@@ -7035,6 +7080,16 @@
   resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
   integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
+"@xenova/transformers@^2.7.0":
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/@xenova/transformers/-/transformers-2.7.0.tgz#0aabc8700d32ed8e28f6aa61abf8653f62fb1678"
+  integrity sha512-py5RqZt9lL/FFUT5X6St+TOSBoVaEmDETI98lK9ApEOvlWeX4bTS2nMQDFe3nFMpv24+wllhmPw2Www/f/ubJA==
+  dependencies:
+    onnxruntime-web "1.14.0"
+    sharp "^0.32.0"
+  optionalDependencies:
+    onnxruntime-node "1.14.0"
+
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -9292,7 +9347,7 @@ browserify-reload@^1.0.3:
     chokidar "^1.6.0"
     ws "^1.1.1"
 
-browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
+browserify-rsa@^4.0.0, browserify-rsa@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
   integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
@@ -9301,19 +9356,19 @@ browserify-rsa@^4.0.0, browserify-rsa@^4.0.1:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"
-  integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.2.tgz#e78d4b69816d6e3dd1c747e64e9947f9ad79bc7e"
+  integrity sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==
   dependencies:
-    bn.js "^5.1.1"
-    browserify-rsa "^4.0.1"
+    bn.js "^5.2.1"
+    browserify-rsa "^4.1.0"
     create-hash "^1.2.0"
     create-hmac "^1.1.7"
-    elliptic "^6.5.3"
+    elliptic "^6.5.4"
     inherits "^2.0.4"
-    parse-asn1 "^5.1.5"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
+    parse-asn1 "^5.1.6"
+    readable-stream "^3.6.2"
+    safe-buffer "^5.2.1"
 
 browserify-wrap@^1.0.1:
   version "1.0.2"
@@ -9595,13 +9650,6 @@ builtins@^1.0.3:
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
   integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==
 
-busboy@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893"
-  integrity sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==
-  dependencies:
-    streamsearch "^1.1.0"
-
 byline@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1"
@@ -10531,6 +10579,14 @@ color-string@^1.6.0:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-string@^1.9.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
+  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
@@ -10544,6 +10600,14 @@ color@^3.1.3:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
+color@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
+  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
+  dependencies:
+    color-convert "^2.0.1"
+    color-string "^1.9.0"
+
 colord@^2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e"
@@ -12013,6 +12077,11 @@ detect-indent@^5.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
   integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
 
+detect-libc@^2.0.0, detect-libc@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.2.tgz#8ccf2ba9315350e1241b88d0ac3b0e1fbd99605d"
+  integrity sha512-UX6sGumvvqSaXgdKGUsgZWqcUyIXZ/vZTrlRT/iobiKhGL0zL4d3osHj3uqllWJK+i+sixDS/3COVEOFbupFyw==
+
 detect-libc@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
@@ -13573,6 +13642,11 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
@@ -14223,6 +14297,11 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
+flatbuffers@^1.12.0:
+  version "1.12.0"
+  resolved "https://registry.yarnpkg.com/flatbuffers/-/flatbuffers-1.12.0.tgz#72e87d1726cb1b216e839ef02658aa87dcef68aa"
+  integrity sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ==
+
 flatted@^3.1.0:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
@@ -14771,9 +14850,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
 get-installed-path@^2.0.3:
   version "2.1.1"
@@ -14995,6 +15074,11 @@ github-base@^0.5.4:
     static-extend "^0.1.2"
     use "^3.0.0"
 
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+  integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -15392,6 +15476,11 @@ growly@^1.2.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
+guid-typescript@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/guid-typescript/-/guid-typescript-1.0.9.tgz#e35f77003535b0297ea08548f5ace6adb1480ddc"
+  integrity sha512-Y8T4vYhEfwJOTbouREvG+3XDsjr8E3kIr7uf+JZ0BYloFsttiHU0WfvANVsR7TxNUJa/WpCnw/Ino/p+DeBhBQ==
+
 gulp-cli@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
@@ -17235,10 +17324,10 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-isomorphic-git@^1.24.0:
-  version "1.24.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-git/-/isomorphic-git-1.24.0.tgz#d3c7487ba67724d63dec0158572cb33767298f4d"
-  integrity sha512-4wV95pUr9kGTRZWB9a266bHfD3QAZzWWLIPxlTou4tgOaz4WKmaMOMKKHywudzigsU8h7YwbXyBLE4OEaK8F9Q==
+isomorphic-git@^1.25.0:
+  version "1.25.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-git/-/isomorphic-git-1.25.0.tgz#3a04d7e70f75ebdbb991f9fa87cfec90e3742c9f"
+  integrity sha512-F8X7z74gL+jN4bd6qB6a3Z0QQzonWPkiQ3nK/oFWlrc2pIwVM9Uksl3YMFh99ltswsqoCoOthgasybX08/fiGg==
   dependencies:
     async-lock "^1.1.0"
     clean-git-ref "^2.0.1"
@@ -18994,6 +19083,11 @@ logplease@^1.2.15:
   resolved "https://registry.yarnpkg.com/logplease/-/logplease-1.2.15.tgz#3da442e93751a5992cc19010a826b08d0293c48a"
   integrity sha512-jLlHnlsPSJjpwUfcNyUxXCl33AYg2cHhIf9QhGL2T4iPT0XPB+xP1LRKFPgIg1M/sg9kAJvy94w9CzBNrfnstA==
 
+long@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
+  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
+
 longest-streak@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.1.0.tgz#62fa67cd958742a1574af9f39866364102d90cd4"
@@ -20092,7 +20186,7 @@ minimist@1.2.6, minimist@^1.2.6:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.7:
+minimist@^1.1.0, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -20233,7 +20327,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp-classic@^0.5.2:
+mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
@@ -20670,10 +20764,10 @@ nanoid@^3.0.2, nanoid@^3.1.3:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.29.tgz#214fb2d7a33e1a5bef4757b779dfaeb6a4e5aeb4"
   integrity sha512-dW2pUSGZ8ZnCFIlBIA31SV8huOGCHb6OwzVCc7A69rb/a+SgPBwfmLvK5TKQ3INPbRkcI8a/Owo0XbiTNH19wg==
 
-nanoid@^3.3.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -20692,6 +20786,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+napi-build-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
+  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+
 napi-macros@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.2.2.tgz#817fef20c3e0e40a963fbf7b37d1600bd0201044"
@@ -20811,6 +20910,13 @@ node-abi@^3.0.0:
   dependencies:
     semver "^7.3.5"
 
+node-abi@^3.3.0:
+  version "3.51.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.51.0.tgz#970bf595ef5a26a271307f8a4befa02823d4e87d"
+  integrity sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==
+  dependencies:
+    semver "^7.3.5"
+
 node-abort-controller@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.0.1.tgz#f91fa50b1dee3f909afabb7e261b1e1d6b0cb74e"
@@ -20831,6 +20937,11 @@ node-addon-api@^3.2.1:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
+node-addon-api@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
+  integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
+
 node-api-version@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080"
@@ -21787,6 +21898,37 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
+onnx-proto@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/onnx-proto/-/onnx-proto-4.0.4.tgz#2431a25bee25148e915906dda0687aafe3b9e044"
+  integrity sha512-aldMOB3HRoo6q/phyB6QRQxSt895HNNw82BNyZ2CMh4bjeKv7g/c+VpAFtJuEMVfYLMbRx61hbuqnKceLeDcDA==
+  dependencies:
+    protobufjs "^6.8.8"
+
+onnxruntime-common@~1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-common/-/onnxruntime-common-1.14.0.tgz#2bb5dac5261269779aa5fb6536ca379657de8bf6"
+  integrity sha512-3LJpegM2iMNRX2wUmtYfeX/ytfOzNwAWKSq1HbRrKc9+uqG/FsEA0bbKZl1btQeZaXhC26l44NWpNUeXPII7Ew==
+
+onnxruntime-node@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-node/-/onnxruntime-node-1.14.0.tgz#c4ae6c355cfae7d83abaf36dd39a905c4a010217"
+  integrity sha512-5ba7TWomIV/9b6NH/1x/8QEeowsb+jBEvFzU6z0T4mNsFwdPqXeFUM7uxC6QeSRkEbWu3qEB0VMjrvzN/0S9+w==
+  dependencies:
+    onnxruntime-common "~1.14.0"
+
+onnxruntime-web@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/onnxruntime-web/-/onnxruntime-web-1.14.0.tgz#c8cee538781b1d4c1c6b043934f4a3e6ddf1466e"
+  integrity sha512-Kcqf43UMfW8mCydVGcX9OMXI2VN17c0p6XvR7IPSZzBf/6lteBzXHvcEVWDPmCKuGombl997HgLqj91F11DzXw==
+  dependencies:
+    flatbuffers "^1.12.0"
+    guid-typescript "^1.0.9"
+    long "^4.0.0"
+    onnx-proto "^4.0.4"
+    onnxruntime-common "~1.14.0"
+    platform "^1.3.6"
+
 open@^8.0.9, open@^8.4.0:
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
@@ -22203,7 +22345,7 @@ parents@^1.0.0, parents@^1.0.1:
   dependencies:
     path-platform "~0.11.15"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.5:
+parse-asn1@^5.0.0, parse-asn1@^5.1.6:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4"
   integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==
@@ -22637,6 +22779,11 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+platform@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.6.tgz#48b4ce983164b209c2d45a107adb31f473a6e7a7"
+  integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
+
 plist@^3.0.0, plist@^3.0.4, plist@^3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3"
@@ -23044,21 +23191,12 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.7:
-  version "8.4.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
-  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
+postcss@^8.3.5, postcss@^8.4.14, postcss@^8.4.17, postcss@^8.4.7:
+  version "8.4.31"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
+  integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
   dependencies:
-    nanoid "^3.3.4"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.4.17:
-  version "8.4.21"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.21.tgz#c639b719a57efc3187b13a1d765675485f4134f4"
-  integrity sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==
-  dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -23072,6 +23210,24 @@ preact@^10.12.0, preact@^10.5.9:
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.13.1.tgz#d220bd8771b8fa197680d4917f3cefc5eed88720"
   integrity sha512-KyoXVDU5OqTpG9LXlB3+y639JAGzl8JSBXLn1J9HTSB3gbKcuInga7bZnXLlxmK94ntTs1EFeZp0lrja2AuBYQ==
 
+prebuild-install@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
+  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
+  dependencies:
+    detect-libc "^2.0.0"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^3.3.0"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^4.0.0"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -23262,6 +23418,25 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
+protobufjs@^6.8.8:
+  version "6.11.4"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.4.tgz#29a412c38bf70d89e537b6d02d904a6f448173aa"
+  integrity sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.2"
+    "@protobufjs/base64" "^1.1.2"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
+
 protocol-buffers-schema@^3.3.1:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03"
@@ -23624,7 +23799,7 @@ rc@^1.0.1, rc@^1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rc@^1.1.1, rc@^1.2.8:
+rc@^1.1.1, rc@^1.2.7, rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -24113,7 +24288,7 @@ readable-stream@2.2.9, readable-stream@~2.2.9:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@^3.6.0:
+readable-stream@^3.6.0, readable-stream@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -25263,6 +25438,13 @@ semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.4.0:
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -25412,6 +25594,20 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
+sharp@^0.32.0:
+  version "0.32.6"
+  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.6.tgz#6ad30c0b7cd910df65d5f355f774aa4fce45732a"
+  integrity sha512-KyLTWwgcR9Oe4d9HwCwNM2l7+J0dUQwn/yf7S0EnTtb0eVS4RxO0eUSvxPtzT4F3SY+C4K6fqdv/DO27sJ/v/w==
+  dependencies:
+    color "^4.2.3"
+    detect-libc "^2.0.2"
+    node-addon-api "^6.1.0"
+    prebuild-install "^7.1.1"
+    semver "^7.5.4"
+    simple-get "^4.0.1"
+    tar-fs "^3.0.4"
+    tunnel-agent "^0.6.0"
+
 shasum-object@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shasum-object/-/shasum-object-1.0.0.tgz#0b7b74ff5b66ecf9035475522fa05090ac47e29e"
@@ -25529,7 +25725,7 @@ simple-get@^2.5.1:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-get@^4.0.1:
+simple-get@^4.0.0, simple-get@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
   integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
@@ -26198,11 +26394,6 @@ stream-to-it@^0.2.0, stream-to-it@^0.2.1:
   dependencies:
     get-iterator "^1.0.2"
 
-streamsearch@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-1.1.0.tgz#404dd1e2247ca94af554e841a8ef0eaa238da764"
-  integrity sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==
-
 streamx@^2.15.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.15.1.tgz#396ad286d8bc3eeef8f5cea3f029e81237c024c6"
@@ -26809,7 +27000,7 @@ tape@^4.13.3:
     string.prototype.trim "~1.2.4"
     through "~2.3.8"
 
-tar-fs@2.1.1:
+tar-fs@2.1.1, tar-fs@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
@@ -26819,7 +27010,7 @@ tar-fs@2.1.1:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
-tar-fs@3.0.4:
+tar-fs@3.0.4, tar-fs@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.4.tgz#a21dc60a2d5d9f55e0089ccd78124f1d3771dbbf"
   integrity sha512-5AFQU8b9qLfZCX9zp2duONhPmZv0hGYiBPJsyUdqMjzq/mqVpy/rEUSeHk1+YitmxugaptgBh5oDGU3VsAJq4w==
@@ -27771,12 +27962,17 @@ undertaker@^1.2.1:
     object.reduce "^1.0.0"
     undertaker-registry "^1.0.0"
 
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
 undici@^5.14.0:
-  version "5.19.1"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.19.1.tgz#92b1fd3ab2c089b5a6bd3e579dcda8f1934ebf6d"
-  integrity sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==
+  version "5.27.2"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.27.2.tgz#a270c563aea5b46cc0df2550523638c95c5d4411"
+  integrity sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==
   dependencies:
-    busboy "^1.6.0"
+    "@fastify/busboy" "^2.0.0"
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"