diff --git a/.env b/.env.local
similarity index 65%
rename from .env
rename to .env.local
index 1a2b47f98f..fb35ddc973 100644
--- a/.env
+++ b/.env.local
@@ -2,4 +2,4 @@ gist_token=<token>
 account_passphrase=<passphrase>
 account_password=<password>
 NODE_OPTIONS=--max-old-space-size=2048
-# WALLET_CONNECT_PROJECT_ID=<walletconnect cloud PROJECT_ID>
+WALLET_CONNECT_PROJECT_ID=<project_id>
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 31b05d0778..72252c06ba 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,8 +25,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. Windows, Linux or MacOS]
- - Browser [e.g. chrome, firefox]
- - Version [e.g. 22]
+ - Browser: [e.g. chrome, firefox]
+ - Version: [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.gitignore b/.gitignore
index 7955bf6455..ab74544426 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ soljson.js
 *_group*.ts
 stats.json
 release
+.env
 
 
 # compiled output
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 83722de3d0..0f5759403b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing
 
-Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.gg/mh9hFCKkEq).
+Everyone is welcome to contribute to Remix's codebase and please join our [Discord](https://discord.com/invite/nfv6ZYjAeP).
 
 ## Development
 Remix libraries work closely with [Remix IDE](https://remix.ethereum.org). Each library has a README to explain its application.
@@ -72,7 +72,7 @@ import panelJson from './panel.json';
 import enJson from '../en';
 
 // There may have some untranslated content. Always fill in the gaps with EN JSON.
-// No need for a defaultMessage prop when render a FormattedMessage component.
+// No need for a defaultMessage prop when rendering a FormattedMessage component.
 export default Object.assign({}, enJson, {
   ...panelJson,
 })
diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
index f9421eb528..ff3170f26e 100644
--- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts
+++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -502,9 +502,9 @@ export class CircomPluginClient extends PluginClient {
           const exists = await this.call('fileManager', 'exists', path)
 
           if (exists) return path
-          else throw new Error(`Report path ${path} do no exist in the Remix FileSystem`)
+          else throw new Error(`Report path ${path} does not exist in the Remix FileSystem`)
         } else {
-          throw new Error(`Report path ${path} do no exist in the Remix FileSystem`)
+          throw new Error(`Report path ${path} does not exist in the Remix FileSystem`)
         }
       }
     }
diff --git a/apps/circuit-compiler/webpack.config.js b/apps/circuit-compiler/webpack.config.js
index fecff4fa70..a4aa984df9 100644
--- a/apps/circuit-compiler/webpack.config.js
+++ b/apps/circuit-compiler/webpack.config.js
@@ -55,7 +55,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ["source-map-loader"],
diff --git a/apps/contract-verification/README.md b/apps/contract-verification/README.md
new file mode 100644
index 0000000000..6cbcd88173
--- /dev/null
+++ b/apps/contract-verification/README.md
@@ -0,0 +1,19 @@
+# Contract Verification Plugin
+
+With this plugin, contracts written and compiled in Remix can be verified at Sourcify, Etherscan, Blockscout and Routescan at the same time. Besides that, the source code of any address can be fetched from the verifiers and added to the file editor.
+
+## Adding a new verification service
+
+Currently, the plugin supports Sourcify, Etherscan, Blockscout and Routescan. To add a new verifier, you need to make the following changes:
+
+In `./src/app/types/VerificationTypes.ts`, add the new verifier to the `VerifierIdentifier` type and the`VERIFIERS` array.
+
+In order to interact with the API of the verification service, you need to create a new class that extends the `AbstractVerifier` class. If your API is based on the Etherscan API, you can simply extend the `EtherscanVerifier` class. In this case, see the `RoutescanVerifier` and the `BlockscoutVerifier` for reference. All related classes are located in the `./src/app/Verifiers` directory.
+
+In `./src/app/Verifiers/index.ts`, add your new verifier to the `getVerifier` function. Validate any settings properties that are required by your verifier.
+
+In `./src/app/utils/default-apis.json`, you need to add default settings for your new verifier. If you can, simply add your defaults in the form of `{ [VerifierIdentifier]: { [chainId]: { apiUrl: [value], explorerUrl: [value] } } }`. If you need more flexibility, you might also want to change the `src/app/utils/default-settings.ts` file. See Routescan there for reference.
+
+Your new verifier will automatically be shown in the `VerifyView` and the `LookupView` since we added it to the `VERIFIERS` array. You only need to make a change to the `SettingsView` because the required settings depend on the verifier. There, add a new div block in the same format as the other verifiers. Only add the `ConfigInput` elements for the settings that your verifier needs to the div block.
+
+That's it! Your verification service should be able to verify contracts through Remix now.
diff --git a/apps/contract-verification/src/app/app.tsx b/apps/contract-verification/src/app/app.tsx
index 0ea4332543..85ebbfb19b 100644
--- a/apps/contract-verification/src/app/app.tsx
+++ b/apps/contract-verification/src/app/app.tsx
@@ -13,6 +13,7 @@ import { CompilerAbstract } from '@remix-project/remix-solidity'
 import { useLocalStorage } from './hooks/useLocalStorage'
 import { getVerifier } from './Verifiers'
 import { ContractDropdownSelection } from './components/ContractDropdown'
+import { IntlProvider } from 'react-intl'
 
 const plugin = new ContractVerificationPluginClient()
 
@@ -32,11 +33,25 @@ const App = () => {
   const [proxyAddressError, setProxyAddressError] = useState('')
   const [abiEncodedConstructorArgs, setAbiEncodedConstructorArgs] = useState<string>('')
   const [abiEncodingError, setAbiEncodingError] = useState<string>('')
+  const [locale, setLocale] = useState<{ code: string; messages: any }>({
+    code: 'en',
+    messages: {}
+  })
 
   const timer = useRef(null)
 
   useEffect(() => {
     plugin.internalEvents.on('verification_activated', () => {
+
+      // @ts-ignore
+      plugin.call('locale', 'currentLocale').then((locale: any) => {
+        setLocale(locale)
+      })
+
+      // @ts-ignore
+      plugin.on('locale', 'localeChanged', (locale: any) => {
+        setLocale(locale)
+      })
       // Fetch compiler artefacts initially
       plugin.call('compilerArtefacts' as any, 'getAllCompilerAbstracts').then((obj: any) => {
         setCompilationOutput(obj)
@@ -143,11 +158,13 @@ const App = () => {
   }, [submittedContracts])
 
   return (
-    <AppContext.Provider value={{ themeType, setThemeType, clientInstance: plugin, settings, setSettings, chains, compilationOutput, submittedContracts, setSubmittedContracts }}>
-      <VerifyFormContext.Provider value={{ selectedChain, setSelectedChain, contractAddress, setContractAddress, contractAddressError, setContractAddressError, selectedContract, setSelectedContract, proxyAddress, setProxyAddress, proxyAddressError, setProxyAddressError, abiEncodedConstructorArgs, setAbiEncodedConstructorArgs, abiEncodingError, setAbiEncodingError }}>
-        <DisplayRoutes />
-      </VerifyFormContext.Provider>
-    </AppContext.Provider>
+    <IntlProvider locale={locale.code} messages={locale.messages}>
+      <AppContext.Provider value={{ themeType, setThemeType, clientInstance: plugin, settings, setSettings, chains, compilationOutput, submittedContracts, setSubmittedContracts }}>
+        <VerifyFormContext.Provider value={{ selectedChain, setSelectedChain, contractAddress, setContractAddress, contractAddressError, setContractAddressError, selectedContract, setSelectedContract, proxyAddress, setProxyAddress, proxyAddressError, setProxyAddressError, abiEncodedConstructorArgs, setAbiEncodedConstructorArgs, abiEncodingError, setAbiEncodingError }}>
+          <DisplayRoutes />
+        </VerifyFormContext.Provider>
+      </AppContext.Provider>
+    </IntlProvider>
   )
 }
 
diff --git a/apps/contract-verification/src/app/components/AccordionReceipt.tsx b/apps/contract-verification/src/app/components/AccordionReceipt.tsx
index 68332d09bb..944cc37046 100644
--- a/apps/contract-verification/src/app/components/AccordionReceipt.tsx
+++ b/apps/contract-verification/src/app/components/AccordionReceipt.tsx
@@ -97,32 +97,32 @@ const ReceiptsBody = ({ receipts }: { receipts: VerificationReceipt[] }) => {
           className="list-group-item d-flex flex-row align-items-center"
         >
           <CustomTooltip
-              placement="top"
-              tooltipClasses=" text-break"
-              tooltipTextClasses="text-capitalize"
-              tooltipText={`Status: ${receipt.status}${receipt.message ? `, Message: ${receipt.message}` : ''}`}
-            >
-              <span className="mr-2">
-                {['verified', 'partially verified', 'already verified'].includes(receipt.status) ?
-                  <i className="fas fa-check text-success px-1"></i> :
-                  receipt.status === 'fully verified' ?
-                    <i className="fas fa-check-double text-success px-1"></i> :
-                    receipt.status === 'failed' ?
-                      <i className="fas fa-xmark text-warning px-1"></i> :
-                      ['pending', 'awaiting implementation verification'].includes(receipt.status) ?
-                        <i className="fas fa-spinner fa-spin"></i> :
-                        <i className="fas fa-question"></i>
-                }
-              </span>
-            </CustomTooltip>
-            <div className="d-flex flex-row w-100 justify-content-between">
+            placement="top"
+            tooltipClasses=" text-break"
+            tooltipTextClasses="text-capitalize"
+            tooltipText={`Status: ${receipt.status}${receipt.message ? `, Message: ${receipt.message}` : ''}`}
+          >
+            <span className="mr-2">
+              {['verified', 'partially verified', 'already verified'].includes(receipt.status) ?
+                <i className="fas fa-check text-success px-1"></i> :
+                receipt.status === 'fully verified' ?
+                  <i className="fas fa-check-double text-success px-1"></i> :
+                  receipt.status === 'failed' ?
+                    <i className="fas fa-xmark text-warning px-1"></i> :
+                    ['pending', 'awaiting implementation verification'].includes(receipt.status) ?
+                      <i className="fas fa-spinner fa-spin"></i> :
+                      <i className="fas fa-question"></i>
+              }
+            </span>
+          </CustomTooltip>
+          <div className="d-flex flex-row w-100 justify-content-between">
             <CustomTooltip placement="top" tooltipClasses=" text-break" tooltipText={`API: ${receipt.verifierInfo.apiUrl}`}>
               <span className="font-weight-bold pr-2">{receipt.verifierInfo.name}</span>
             </CustomTooltip>
             <div className="ml-1">
               {!!receipt.lookupUrl && receipt.verifierInfo.name === 'Blockscout' ?
                 <CopyToClipboard classList="pr-0 py-0" tip="Copy code URL" content={receipt.lookupUrl} direction="top" /> :
-                !!receipt.lookupUrl && <a href={receipt.lookupUrl} target="_blank" className="fa fas fa-arrow-up-right-from-square"></a>
+                !!receipt.lookupUrl && <a href={receipt.lookupUrl} target="_blank" className="fa fas fa-arrow-up-right-from-square" rel="noreferrer"></a>
               }
             </div>
           </div>
diff --git a/apps/contract-verification/src/app/components/ConfigInput.tsx b/apps/contract-verification/src/app/components/ConfigInput.tsx
index 0737840115..9f08ab42c5 100644
--- a/apps/contract-verification/src/app/components/ConfigInput.tsx
+++ b/apps/contract-verification/src/app/components/ConfigInput.tsx
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { CustomTooltip } from '@remix-ui/helper'
+import { FormattedMessage, useIntl } from 'react-intl'
 
 interface ConfigInputProps {
   label: string
@@ -13,6 +14,7 @@ interface ConfigInputProps {
 export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, initialValue, saveResult }) => {
   const [value, setValue] = useState(initialValue)
   const [enabled, setEnabled] = useState(false)
+  const intl = useIntl()
 
   // Reset state when initialValue changes
   useEffect(() => {
@@ -42,7 +44,7 @@ export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, ini
           type={secret ? 'password' : 'text'}
           className={`form-control small w-100 ${!enabled ? 'bg-transparent pl-0 border-0' : ''}`}
           id={id}
-          placeholder={`Add ${label}`}
+          placeholder={intl.formatMessage({ id: "contract-verification.configInputPlaceholder" }, { label })}
           value={value}
           onChange={(e) => setValue(e.target.value)}
           disabled={!enabled}
@@ -51,10 +53,10 @@ export const ConfigInput: React.FC<ConfigInputProps> = ({ label, id, secret, ini
         { enabled ? (
           <>
             <button type="button" className="btn btn-primary btn-sm ml-2" onClick={handleSave}>
-              Save
+              <FormattedMessage id="contract-verification.configInputSaveButton" />
             </button>
             <button type="button" className="btn btn-secondary btn-sm ml-2" onClick={handleCancel}>
-              Cancel
+              <FormattedMessage id="contract-verification.configInputCancelButton" />
             </button>
           </>
         ) : (
diff --git a/apps/contract-verification/src/app/components/ConstructorArguments.tsx b/apps/contract-verification/src/app/components/ConstructorArguments.tsx
index e2a4239eaa..46fa9822a7 100644
--- a/apps/contract-verification/src/app/components/ConstructorArguments.tsx
+++ b/apps/contract-verification/src/app/components/ConstructorArguments.tsx
@@ -3,6 +3,7 @@ import { ethers } from 'ethers'
 
 import { AppContext } from '../AppContext'
 import { ContractDropdownSelection } from './ContractDropdown'
+import { FormattedMessage } from 'react-intl'
 
 interface ConstructorArgumentsProps {
   abiEncodedConstructorArgs: string
@@ -102,7 +103,9 @@ export const ConstructorArguments: React.FC<ConstructorArgumentsProps> = ({ abiE
       <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
         <input className="form-check-input custom-control-input" type="checkbox" id="toggleRawInputSwitch" checked={toggleRawInput} onChange={() => setToggleRawInput(!toggleRawInput)} />
         <label className="m-0 form-check-label custom-control-label" style={{ paddingTop: '2px' }} htmlFor="toggleRawInputSwitch">
-          Enter raw ABI-encoded constructor arguments
+          <FormattedMessage
+            id="contract-verification.constructorArgumentsToggleRawInput"
+          />
         </label>
       </div>
       {toggleRawInput ? (
@@ -122,7 +125,10 @@ export const ConstructorArguments: React.FC<ConstructorArgumentsProps> = ({ abiE
           {abiEncodedConstructorArgs && (
             <div>
               <label className="form-check-label" htmlFor="rawAbiEncodingResult">
-                ABI-encoded constructor arguments:
+                <FormattedMessage
+                  id="contract-verification.constructorArgumentsRawAbiEncodingResult"
+                  defaultMessage="ABI-encoded constructor arguments"
+                /> :
               </label>
               <textarea className="form-control" rows={5} disabled value={abiEncodedConstructorArgs} id="rawAbiEncodingResult" style={{ opacity: 0.5 }} />
             </div>
diff --git a/apps/contract-verification/src/app/components/ContractAddressInput.tsx b/apps/contract-verification/src/app/components/ContractAddressInput.tsx
index 5eb6e73d1e..ef0af854b0 100644
--- a/apps/contract-verification/src/app/components/ContractAddressInput.tsx
+++ b/apps/contract-verification/src/app/components/ContractAddressInput.tsx
@@ -2,11 +2,11 @@ import React, { useEffect, useState, useContext } from 'react'
 import { ethers } from 'ethers/'
 
 interface ContractAddressInputProps {
-  label: string
+  label: string | any
   id: string
   contractAddress: string
   setContractAddress: (address: string) => void
-  contractAddressError: string
+  contractAddressError: string | any
   setContractAddressError: (error: string) => void
 }
 
diff --git a/apps/contract-verification/src/app/components/ContractDropdown.tsx b/apps/contract-verification/src/app/components/ContractDropdown.tsx
index b307aad1e4..751f292f6c 100644
--- a/apps/contract-verification/src/app/components/ContractDropdown.tsx
+++ b/apps/contract-verification/src/app/components/ContractDropdown.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useContext, Fragment } from 'react'
 import './ContractDropdown.css'
 import { AppContext } from '../AppContext'
+import { FormattedMessage } from 'react-intl'
 
 export interface ContractDropdownSelection {
   triggerFilePath: string
@@ -42,7 +43,7 @@ export const ContractDropdown: React.FC<ContractDropdownProps> = ({ label, id, s
 
   return (
     <div className="form-group">
-      <label htmlFor={id}>{label}</label>
+      <label htmlFor={id}><FormattedMessage id="contract-verification.contractDropdownLabel" defaultMessage={label} values={{ label }} /></label>
       <select value={selectedContract ? JSON.stringify(selectedContract) : ''}
         className={`form-control custom-select pr-4 ${!hasContracts ? 'disabled-cursor text-warning' : ''}`}
         id={id}
@@ -65,7 +66,7 @@ export const ContractDropdown: React.FC<ContractDropdownProps> = ({ label, id, s
             </optgroup>
           ))
         ) : (
-          <option>Compiled contract required</option>
+          <option value={''}><FormattedMessage id="contract-verification.contractDropDownDefaultText" defaultMessage={'Compiled contract required'} /></option>
         )}
       </select>
     </div>
diff --git a/apps/contract-verification/src/app/components/NavMenu.tsx b/apps/contract-verification/src/app/components/NavMenu.tsx
index d835e1a193..1722c2a7d9 100644
--- a/apps/contract-verification/src/app/components/NavMenu.tsx
+++ b/apps/contract-verification/src/app/components/NavMenu.tsx
@@ -1,13 +1,15 @@
 import React from 'react'
 import { NavLink } from 'react-router-dom'
+import { useIntl, FormattedMessage } from 'react-intl'
 
 interface NavItemProps {
   to: string
   icon: JSX.Element
-  title: string
+  title: string | any
 }
 
 const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
+  const intl = useIntl()
   return (
     <NavLink
       data-id={`${title}Tab`}
@@ -24,11 +26,11 @@ const NavItem: React.FC<NavItemProps> = ({ to, icon, title }) => {
 
 export const NavMenu = () => {
   return (
-    <nav className="d-flex medium flex-row w-100" style={{backgroundColor: 'var(--body-bg)!important'}}>
-      <NavItem to="/" icon={<i className="fas fa-home"></i>} title="Verify" />
-      <NavItem to="/receipts" icon={<i className="fas fa-receipt"></i>} title="Receipts" />
-      <NavItem to="/lookup" icon={<i className="fas fa-search"></i>} title="Lookup" />
-      <NavItem to="/settings" icon={<i className="fas fa-cog"></i>} title="Settings" />
+    <nav className="d-flex medium flex-row w-100" style={{ backgroundColor: 'var(--body-bg)!important' }}>
+      <NavItem to="/" icon={<i className="fas fa-home"></i>} title={ <FormattedMessage id="contract-verification.verifyNavTitle" defaultMessage={'Verify'} /> } />
+      <NavItem to="/receipts" icon={<i className="fas fa-receipt"></i>} title={ <FormattedMessage id="contract-verification.receiptsNavTitle" defaultMessage={'Receipts'} /> } />
+      <NavItem to="/lookup" icon={<i className="fas fa-search"></i>} title={ <FormattedMessage id="contract-verification.lookupNavTitle" defaultMessage={'Lookup'} /> } />
+      <NavItem to="/settings" icon={<i className="fas fa-cog"></i>} title={ <FormattedMessage id="contract-verification.settingsNavTitle" defaultMessage={'Settings'} /> } />
     </nav>
   )
 }
diff --git a/apps/contract-verification/src/app/components/SearchableChainDropdown.tsx b/apps/contract-verification/src/app/components/SearchableChainDropdown.tsx
index 281c763023..1fe123f0c9 100644
--- a/apps/contract-verification/src/app/components/SearchableChainDropdown.tsx
+++ b/apps/contract-verification/src/app/components/SearchableChainDropdown.tsx
@@ -2,6 +2,7 @@ import React, { useState, useEffect, useRef, useMemo } from 'react'
 import Fuse from 'fuse.js'
 import type { Chain } from '../types'
 import { AppContext } from '../AppContext'
+import { useIntl } from 'react-intl'
 
 function getChainDescriptor(chain: Chain): string {
   if (!chain) return ''
@@ -9,7 +10,7 @@ function getChainDescriptor(chain: Chain): string {
 }
 
 interface DropdownProps {
-  label: string
+  label: string | any
   id: string
   setSelectedChain: (chain: Chain) => void
   selectedChain: Chain
@@ -18,6 +19,7 @@ interface DropdownProps {
 export const SearchableChainDropdown: React.FC<DropdownProps> = ({ label, id, setSelectedChain, selectedChain }) => {
   const { chains } = React.useContext(AppContext)
   const ethereumChainIds = [1, 11155111, 17000]
+  const intl = useIntl()
 
   // Add Ethereum chains to the head of the chains list. Sort the rest alphabetically
   const dropdownChains = useMemo(
@@ -90,7 +92,7 @@ export const SearchableChainDropdown: React.FC<DropdownProps> = ({ label, id, se
       {' '}
       {/* Add ref here */}
       <label htmlFor={id}>{label}</label>
-      <input type="text" value={searchTerm} onChange={handleInputChange} onClick={openDropdown} data-id="chainDropdownbox" placeholder="Select a chain" className="form-control" />
+      <input type="text" value={searchTerm} onChange={handleInputChange} onClick={openDropdown} data-id="chainDropdownbox" placeholder={intl.formatMessage({ id: "contract-verification.searchableChainDropdown", defaultMessage: "Select a chain" })} className="form-control" />
       <ul className="dropdown-menu show w-100 bg-light" style={{ maxHeight: '400px', overflowY: 'auto', display: isOpen ? 'initial' : 'none' }}>
         {filteredOptions.map((chain) => (
           <li key={chain.chainId} onClick={() => handleOptionClick(chain)} data-id={chain.chainId} className={`dropdown-item text-dark ${selectedChain?.chainId === chain.chainId ? 'active' : ''}`} style={{ cursor: 'pointer', whiteSpace: 'normal' }}>
diff --git a/apps/contract-verification/src/app/layouts/Default.tsx b/apps/contract-verification/src/app/layouts/Default.tsx
index b02a4a77e3..d4276c5207 100644
--- a/apps/contract-verification/src/app/layouts/Default.tsx
+++ b/apps/contract-verification/src/app/layouts/Default.tsx
@@ -4,8 +4,8 @@ import { NavMenu } from '../components/NavMenu'
 
 interface Props {
   from: string
-  title?: string
-  description?: string
+  title?: string | any
+  description?: string | any
 }
 
 export const DefaultLayout = ({ children, title, description }: PropsWithChildren<Props>) => {
diff --git a/apps/contract-verification/src/app/routes.tsx b/apps/contract-verification/src/app/routes.tsx
index 958262b75f..9378953f4e 100644
--- a/apps/contract-verification/src/app/routes.tsx
+++ b/apps/contract-verification/src/app/routes.tsx
@@ -3,6 +3,7 @@ import { HashRouter as Router, Route, Routes } from 'react-router-dom'
 
 import { VerifyView, ReceiptsView, LookupView, SettingsView } from './views'
 import { DefaultLayout } from './layouts'
+import { FormattedMessage } from 'react-intl'
 
 const DisplayRoutes = () => (
   <Router>
@@ -10,7 +11,7 @@ const DisplayRoutes = () => (
       <Route
         path="/"
         element={
-          <DefaultLayout from="/" title="Verify" description="Verify compiled contracts on different verification services">
+          <DefaultLayout from="/" title="Verify" description={<FormattedMessage id="contract-verification.verifyDefaultLayout.description" defaultMessage="Verify compiled contracts on different verification services" />}>
             <VerifyView />
           </DefaultLayout>
         }
@@ -19,7 +20,7 @@ const DisplayRoutes = () => (
       <Route
         path="/receipts"
         element={
-          <DefaultLayout from="/" title="Receipts" description="Check the verification statuses of contracts submitted for verification">
+          <DefaultLayout from="/" title="Receipts" description={<FormattedMessage id="contract-verification.receiptsDefaultLayout.description" defaultMessage="Check the verification statuses of contracts submitted for verification" />}>
             <ReceiptsView />
           </DefaultLayout>
         }
@@ -28,7 +29,7 @@ const DisplayRoutes = () => (
       <Route
         path="/lookup"
         element={
-          <DefaultLayout from="/" title="Lookup" description="Search for verified contracts and download them to Remix">
+          <DefaultLayout from="/" title="Lookup" description={<FormattedMessage id="contract-verification.lookupDefaultLayout.description" defaultMessage="Lookup the verification status of a contract by its address" />}>
             <LookupView />
           </DefaultLayout>
         }
@@ -37,7 +38,7 @@ const DisplayRoutes = () => (
       <Route
         path="/settings"
         element={
-          <DefaultLayout from="/" title="Settings" description="Customize settings for each verification service and chain">
+          <DefaultLayout from="/" title="Settings" description={<FormattedMessage id="contract-verification.settingsDefaultLayout.description" defaultMessage="Configure the settings for the contract verification plugin" />}>
             <SettingsView />
           </DefaultLayout>
         }
diff --git a/apps/contract-verification/src/app/views/LookupView.tsx b/apps/contract-verification/src/app/views/LookupView.tsx
index d3e4c53095..17fca06200 100644
--- a/apps/contract-verification/src/app/views/LookupView.tsx
+++ b/apps/contract-verification/src/app/views/LookupView.tsx
@@ -9,6 +9,7 @@ import { useNavigate } from 'react-router-dom'
 import { VerifyFormContext } from '../VerifyFormContext'
 import { useSourcifySupported } from '../hooks/useSourcifySupported'
 import { CopyToClipboard } from '@remix-ui/clipboard'
+import { FormattedMessage } from 'react-intl'
 
 export const LookupView = () => {
   const { settings, clientInstance } = useContext(AppContext)
@@ -74,10 +75,10 @@ export const LookupView = () => {
   return (
     <>
       <form onSubmit={handleLookup}>
-        <SearchableChainDropdown label="Chain" id="network-dropdown" selectedChain={selectedChain} setSelectedChain={setSelectedChain} />
-        <ContractAddressInput label="Contract Address" id="contract-address" contractAddress={contractAddress} setContractAddress={setContractAddress} contractAddressError={contractAddressError} setContractAddressError={setContractAddressError} />
+        <SearchableChainDropdown label={<FormattedMessage id="contract-verification.searchableChainDropdownLabel" defaultMessage="Chain" />} id="network-dropdown" selectedChain={selectedChain} setSelectedChain={setSelectedChain} />
+        <ContractAddressInput label={<FormattedMessage id="contract-verification.contractAddressInput" defaultMessage="Contract Address" />} id="contract-address" contractAddress={contractAddress} setContractAddress={setContractAddress} contractAddressError={contractAddressError} setContractAddressError={setContractAddressError} />
         <button type="submit" className="btn w-100 btn-primary" disabled={submitDisabled}>
-          Lookup
+          <FormattedMessage id="contract-verification.lookupButton" defaultMessage="Lookup" />
         </button>
       </form>
       <div className="pt-3">
diff --git a/apps/contract-verification/src/app/views/ReceiptsView.tsx b/apps/contract-verification/src/app/views/ReceiptsView.tsx
index 70a39631b3..e2e8fdb701 100644
--- a/apps/contract-verification/src/app/views/ReceiptsView.tsx
+++ b/apps/contract-verification/src/app/views/ReceiptsView.tsx
@@ -1,6 +1,7 @@
 import { useContext } from 'react'
 import { AccordionReceipt } from '../components/AccordionReceipt'
 import { AppContext } from '../AppContext'
+import { FormattedMessage } from 'react-intl'
 
 export const ReceiptsView = () => {
   const { submittedContracts } = useContext(AppContext)
@@ -10,7 +11,9 @@ export const ReceiptsView = () => {
     <div>
       {contracts.length > 0 ? contracts.map((contract, index) => (
         <AccordionReceipt key={contract.id} contract={contract} index={index} />
-      )) : <div className="text-center mt-5" data-id="noContractsSubmitted">No contracts submitted for verification</div>}
+      )) : <div className="text-center mt-5" data-id="noContractsSubmitted">
+        <FormattedMessage id="contract-verification.receipts.noContractsSubmitted" defaultMessage="No contracts submitted for verification" />
+      </div>}
     </div>
   )
 }
diff --git a/apps/contract-verification/src/app/views/SettingsView.tsx b/apps/contract-verification/src/app/views/SettingsView.tsx
index e96c9187ed..65817f6ac8 100644
--- a/apps/contract-verification/src/app/views/SettingsView.tsx
+++ b/apps/contract-verification/src/app/views/SettingsView.tsx
@@ -4,6 +4,7 @@ import type { VerifierIdentifier, VerifierSettings, ContractVerificationSettings
 import { mergeChainSettingsWithDefaults } from '../utils'
 import { AppContext } from '../AppContext'
 import { VerifyFormContext } from '../VerifyFormContext'
+import { FormattedMessage } from 'react-intl'
 
 export const SettingsView = () => {
   const { settings, setSettings } = useContext(AppContext)
@@ -28,7 +29,7 @@ export const SettingsView = () => {
 
   return (
     <>
-      <SearchableChainDropdown label="Chain" id="network-dropdown" setSelectedChain={setSelectedChain} selectedChain={selectedChain} />
+      <SearchableChainDropdown label={<FormattedMessage id="contract-verification.searchableChainDropdownLabel" defaultMessage="Chain" />} id="network-dropdown" setSelectedChain={setSelectedChain} selectedChain={selectedChain} />
 
       {selectedChain && (
         <div>
diff --git a/apps/contract-verification/src/app/views/VerifyView.tsx b/apps/contract-verification/src/app/views/VerifyView.tsx
index 2e3559634a..32ee3d995f 100644
--- a/apps/contract-verification/src/app/views/VerifyView.tsx
+++ b/apps/contract-verification/src/app/views/VerifyView.tsx
@@ -5,12 +5,13 @@ import { SearchableChainDropdown, ContractDropdown, ContractAddressInput } from
 import type { VerifierIdentifier, SubmittedContract, VerificationReceipt, VerifierInfo, VerificationResponse } from '../types'
 import { VERIFIERS } from '../types'
 import { mergeChainSettingsWithDefaults, validConfiguration } from '../utils'
-import { useNavigate } from 'react-router-dom'
+import { Form, useNavigate } from 'react-router-dom'
 import { ConstructorArguments } from '../components/ConstructorArguments'
 import { CustomTooltip } from '@remix-ui/helper'
 import { AbstractVerifier, getVerifier } from '../Verifiers'
 import { VerifyFormContext } from '../VerifyFormContext'
 import { useSourcifySupported } from '../hooks/useSourcifySupported'
+import { FormattedMessage } from 'react-intl'
 
 export const VerifyView = () => {
   const { compilationOutput, setSubmittedContracts, settings, clientInstance } = useContext(AppContext)
@@ -177,9 +178,14 @@ export const VerifyView = () => {
 
   return (
     <form onSubmit={handleVerify}>
-      <SearchableChainDropdown label="Chain" id="network-dropdown" selectedChain={selectedChain} setSelectedChain={setSelectedChain} />
+      <SearchableChainDropdown
+        label={<FormattedMessage id="contract-verification.searchableChainDropdown" defaultMessage={"Chain"} />}
+        id="network-dropdown"
+        selectedChain={selectedChain}
+        setSelectedChain={setSelectedChain}
+      />
       <ContractAddressInput
-        label="Contract Address"
+        label={<FormattedMessage id="contract-verification.contractAddressInput" defaultMessage={"Contract Address"}/>}
         id="contract-address"
         contractAddress={contractAddress}
         setContractAddress={setContractAddress}
@@ -200,11 +206,11 @@ export const VerifyView = () => {
         <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
           <input id="has-proxy" className="form-check-input custom-control-input" type="checkbox" checked={!!hasProxy} onChange={(e) => setHasProxy(e.target.checked)} />
           <label htmlFor="has-proxy" className="m-0 form-check-label custom-control-label" style={{ paddingTop: '2px' }}>
-            The deployed contract is behind a proxy
+            <FormattedMessage id="contract-verification.proxyInputLabel" defaultMessage={'The deployed contract is behind a proxy'} />
           </label>
         </div>
         {hasProxy && <ContractAddressInput
-          label="Proxy Address"
+          label={<FormattedMessage id="contract-verification.proxyContractAddressInput" defaultMessage={'Proxy Address'} />}
           id="proxy-address"
           contractAddress={proxyAddress}
           setContractAddress={setProxyAddress}
@@ -261,14 +267,14 @@ export const VerifyView = () => {
         })}
       </div>
       <CustomTooltip tooltipText={submitDisabled ? (
-        (!!contractAddressError || !contractAddress) ? "Please provide a valid contract address." :
-          !selectedChain ? "Please select the chain." :
-            !selectedContract ? "Please select the contract (compile if needed)." :
-              ((hasProxy && !!proxyAddressError) || (hasProxy && !proxyAddress)) ? "Please provide a valid proxy contract address." :
-                "Please provide all necessary data to verify") // Is not expected to be a case
-        : "Verify with selected tools"}>
+        (!!contractAddressError || !contractAddress) ? <FormattedMessage id="contract-verification.contractAddressError" defaultMessage="Please provide a valid contract address." /> :
+          !selectedChain ? <FormattedMessage id="contract-verification.chainError" defaultMessage="Please select the chain." /> :
+            !selectedContract ? <FormattedMessage id="contract-verification.selectedContractError" defaultMessage="Please select the contract." /> :
+              ((hasProxy && !!proxyAddressError) || (hasProxy && !proxyAddress)) ? <FormattedMessage id="contract-verification.proxyAddressError" defaultMessage="Please provide a valid proxy address." /> :
+                <FormattedMessage id="contract-verification.generalVerifyError" defaultMessage={"Please provide all necessary data to verify"} />) // Is not expected to be a case
+        : <FormattedMessage id="contract-verification.verifyButtonTooltip" defaultMessage="Verify the contract on the selected chains with the selected verifiers." />}>
         <button type="submit" className="w-100 btn btn-primary mt-3" disabled={submitDisabled}>
-          Verify
+          <FormattedMessage id="contract-verification.verifyButton" defaultMessage="Verify" />
         </button>
       </CustomTooltip>
     </form>
diff --git a/apps/contract-verification/src/profile.json b/apps/contract-verification/src/profile.json
index f56f684c71..1cc07d5b72 100644
--- a/apps/contract-verification/src/profile.json
+++ b/apps/contract-verification/src/profile.json
@@ -6,7 +6,7 @@
   "events": [],
   "methods": [],
   "kind": "none",
-  "icon": "data:image/png;base64,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",
+  "icon": "data:image/png;base64,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",
   "location": "sidePanel",
   "url": "",
   "repo": "https://github.com/ethereum/remix-project/tree/master/apps/contract-verification",
diff --git a/apps/contract-verification/webpack.config.js b/apps/contract-verification/webpack.config.js
index 48cddff3df..8d0246f078 100644
--- a/apps/contract-verification/webpack.config.js
+++ b/apps/contract-verification/webpack.config.js
@@ -56,7 +56,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/debugger/webpack.config.js b/apps/debugger/webpack.config.js
index 4bc648f1db..3c2848f266 100644
--- a/apps/debugger/webpack.config.js
+++ b/apps/debugger/webpack.config.js
@@ -48,7 +48,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/doc-gen/webpack.config.js b/apps/doc-gen/webpack.config.js
index 86bcf51395..947f6b0346 100644
--- a/apps/doc-gen/webpack.config.js
+++ b/apps/doc-gen/webpack.config.js
@@ -40,7 +40,7 @@ module.exports = composePlugins(withNx(), withReact(), config => {
     new webpack.DefinePlugin({}),
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/doc-viewer/webpack.config.js b/apps/doc-viewer/webpack.config.js
index b21898ae87..e35074deef 100644
--- a/apps/doc-viewer/webpack.config.js
+++ b/apps/doc-viewer/webpack.config.js
@@ -28,7 +28,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     new webpack.DefinePlugin({})
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/learneth/src/pages/StepDetail/index.tsx b/apps/learneth/src/pages/StepDetail/index.tsx
index f235b885eb..0bf02df52e 100644
--- a/apps/learneth/src/pages/StepDetail/index.tsx
+++ b/apps/learneth/src/pages/StepDetail/index.tsx
@@ -85,7 +85,7 @@ function StepDetailPage() {
           <div className="errorloadingspacer"></div>
           <h1 className="pl-3 pr-3 pt-3 pb-1">{clonedStep.name}</h1>
           <button
-            className="w-100nav-item rounded-0 nav-link btn btn-success test"
+            className="w-100 nav-item rounded-0 nav-link btn btn-success test"
             onClick={() => {
               dispatch({
                 type: 'remixide/displayFile',
diff --git a/apps/learneth/src/redux/models/remixide.ts b/apps/learneth/src/redux/models/remixide.ts
index f4c279ce31..89a406d84a 100644
--- a/apps/learneth/src/redux/models/remixide.ts
+++ b/apps/learneth/src/redux/models/remixide.ts
@@ -33,7 +33,9 @@ const Model: ModelType = {
         },
       })
 
-      yield remixClient.onload()
+      yield remixClient.onload(() => {
+        remixClient.call('manager', 'activatePlugin', 'solidityUnitTesting')
+      })
 
       toast.dismiss()
 
diff --git a/apps/learneth/webpack.config.js b/apps/learneth/webpack.config.js
index 4db6b9fc00..5831ed0a23 100644
--- a/apps/learneth/webpack.config.js
+++ b/apps/learneth/webpack.config.js
@@ -54,7 +54,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/noir-compiler/webpack.config.js b/apps/noir-compiler/webpack.config.js
index fecff4fa70..a4aa984df9 100644
--- a/apps/noir-compiler/webpack.config.js
+++ b/apps/noir-compiler/webpack.config.js
@@ -55,7 +55,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ["source-map-loader"],
diff --git a/apps/quick-dapp/webpack.config.js b/apps/quick-dapp/webpack.config.js
index 4db6b9fc00..5831ed0a23 100644
--- a/apps/quick-dapp/webpack.config.js
+++ b/apps/quick-dapp/webpack.config.js
@@ -54,7 +54,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/remix-dapp/src/locales/en/udapp.json b/apps/remix-dapp/src/locales/en/udapp.json
index 0badbdc97e..8fbb32f619 100644
--- a/apps/remix-dapp/src/locales/en/udapp.json
+++ b/apps/remix-dapp/src/locales/en/udapp.json
@@ -26,7 +26,7 @@
   "udapp.contractOptionsTitle2": "Select a compiled contract to deploy or to use with At Address.",
   "udapp.contractOptionsTitle3": "Select and compile *.sol file to deploy or access a contract.",
   "udapp.contractOptionsTitle4": "When there is a compiled .sol file, choose the  contract to deploy or to use with At Address.",
-  "udapp.checkSumWarning": "It seems you are not using a checksumed address.A checksummed address is an address that contains uppercase letters, as specified in {a}.Checksummed addresses are meant to help prevent users from sending transactions to the wrong address.",
+  "udapp.checkSumWarning": "It seems you are not using a checksummed address.A checksummed address is an address that contains uppercase letters, as specified in {a}.Checksummed addresses are meant to help prevent users from sending transactions to the wrong address.",
   "udapp.isOverSizePromptEip170": "Contract creation initialization returns data with length of more than 24576 bytes. The deployment will likely fail if the current network has activated the eip 170. More info: {a}",
   "udapp.isOverSizePromptEip3860": "Contract creation init code exceeds the allowed max code size of 49152 bytes. The deployment will likely fail if the current network has activated the eip 3860. More info: {a}",
   "udapp.thisContractMayBeAbstract": "This contract may be abstract, it may not implement an abstract parent's methods completely or it may not invoke an inherited contract's constructor correctly.",
@@ -50,12 +50,15 @@
   "udapp.hash": "hash",
   "udapp.signature": "signature",
   "udapp.forkStateTitle": "Fork VM state",
-  "udapp.forkStateLabel": "State Name",
+  "udapp.forkStateLabel": "New environment name",
+  "udapp.forkVmStateDesc1":"Forking state will create a new environment with same state as selected environment",
+  "udapp.forkVmStateDesc2":"New environment will be pinned, which can be unpinned or deleted using Envionment Explorer",
   "udapp.fork": "Fork",
-  "udapp.deleteVmStateTitle": "Delete VM state",
-  "udapp.deleteVmStateDesc1": "Deleting the state of this VM will delete the associated transaction details in this Workspace.",
-  "udapp.deleteVmStateDesc2": "It will also delete the data of contracts deployed and pinned in this Workspace.",
-  "udapp.deleteVmStateDesc3": "Do you want to continue?",
+  "udapp.resetVmStateTitle": "Reset VM state",
+  "udapp.resetVmStateDesc1": "Resetting the state of this VM will delete the associated transaction details in this Workspace.",
+  "udapp.resetVmStateDesc2": "It will also delete the data of contracts deployed and pinned in this Workspace.",
+  "udapp.resetVmStateDesc3": "Do you want to continue?",
+  "udapp.reset": "Reset",
   "udapp.delete": "Delete",
   "udapp.injectedTitle": "Unfortunately it's not possible to create an account using injected provider. Please create the account directly from your provider (i.e metamask or other of the same type).",
   "udapp.createNewAccount": "Create a new account",
@@ -133,7 +136,7 @@
   "udapp.contractCreation": "Contract Creation",
   "udapp.transactionFee": "Transaction is invalid. Max fee should not be less than Base fee",
   "udapp.title1": "Represents the part of the tx fee that goes to the miner.",
-  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimun needs to be set to base fee.",
+  "udapp.title2": "Represents the maximum amount of fee that you will pay for this transaction. The minimum needs to be set to base fee.",
   "udapp.gasPrice": "Gas price",
   "udapp.gweiText": "visit {a} for current gas price info.",
   "udapp.maxTransactionFee": "Max transaction fee",
diff --git a/apps/remix-dapp/src/locales/zh/udapp.json b/apps/remix-dapp/src/locales/zh/udapp.json
index 35dad029bb..7fb99322b3 100644
--- a/apps/remix-dapp/src/locales/zh/udapp.json
+++ b/apps/remix-dapp/src/locales/zh/udapp.json
@@ -23,7 +23,7 @@
   "udapp.contractOptionsTitle2": "选择要部署或与 At Address 一起使用的已编译合约。",
   "udapp.contractOptionsTitle3": "选择并编译 *.sol 文件以部署或访问合约。",
   "udapp.contractOptionsTitle4": "当有编译的 .sol 文件时，选择 {br} 合约进行部署或与 AtAddress 一起使用。",
-  "udapp.checkSumWarning": "您似乎没有使用 checksumed address 。{br} checksumed address 是包含大写字母的地址，如 {a} 中所指定。{br} checksumed address 旨在帮助防止用户将交易发送到错误地址。",
+  "udapp.checkSumWarning": "您似乎没有使用 checksummed address 。{br} checksummed address 是包含大写字母的地址，如 {a} 中所指定。{br} checksummed address 旨在帮助防止用户将交易发送到错误地址。",
   "udapp.isOverSizePromptEip170": "合约创建初始化返回长度超过24576字节的数据。部署可能会失败。 {br}更多信息：{a}",
   "udapp.isOverSizePromptEip3860": "合约创建初始化代码超出了允许的最大代码大小 49152 字节。如果当前网络已激活 eip 3860，则部署可能会失败。更多信息：{a}",
   "udapp.thisContractMayBeAbstract": "这个合约可能是抽象的，它可能没有完全实现抽象父类的方法，或者它可能没有正确调用继承合约的构造函数。",
diff --git a/apps/remix-dapp/webpack.config.js b/apps/remix-dapp/webpack.config.js
index 8a8306b36a..7eeee21e2e 100644
--- a/apps/remix-dapp/webpack.config.js
+++ b/apps/remix-dapp/webpack.config.js
@@ -72,7 +72,7 @@ module.exports = composePlugins(withNx(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
index 48270c6b9b..2ea64cd43b 100644
--- a/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
+++ b/apps/remix-ide-e2e/src/commands/addAtAddressInstance.ts
@@ -19,11 +19,11 @@ function addInstance (browser: NightwatchBrowser, address: string, isValidFormat
   .waitForElementVisible('.ataddressinput')
   .click('.ataddressinput')
   .setValue('.ataddressinput', address, function () {
-    if (!isValidFormat || !isValidChecksum) browser.assert.elementPresent('button[id^="runAndDeployAtAdressButton"]:disabled')
+    if (!isValidFormat || !isValidChecksum) browser.assert.elementPresent('button[id^="runAndDeployAtAddressButton"]:disabled')
     else if (isAbi) {
       browser
         .click({
-          selector: '//*[@id="runAndDeployAtAdressButtonContainer"]',
+          selector: '//*[@id="runAndDeployAtAddressButtonContainer"]',
           locateStrategy: 'xpath'
          })
         .waitForElementPresent('[data-id="udappNotify-modal-footer-ok-react"]', 5000)
@@ -34,7 +34,7 @@ function addInstance (browser: NightwatchBrowser, address: string, isValidFormat
         })
     } else {
       browser.click({
-        selector: '//*[@id="runAndDeployAtAdressButtonContainer"]',
+        selector: '//*[@id="runAndDeployAtAddressButtonContainer"]',
         locateStrategy: 'xpath'
       })
     }
diff --git a/apps/remix-ide-e2e/src/commands/selectContract.ts b/apps/remix-ide-e2e/src/commands/selectContract.ts
index d270f8949d..87bbc40c30 100644
--- a/apps/remix-ide-e2e/src/commands/selectContract.ts
+++ b/apps/remix-ide-e2e/src/commands/selectContract.ts
@@ -4,19 +4,14 @@ import EventEmitter from 'events'
 const selector = '.udapp_contractNames'
 
 class SelectContract extends EventEmitter {
-  command (this: NightwatchBrowser, contractName: string): NightwatchBrowser {
-    this.api.waitForElementVisible(selector).perform((done) => {
-      selectContract(this.api, contractName, () => {
-        done()
-        this.emit('complete')
-      })
-    })
+  command(this: NightwatchBrowser, contractName: string): NightwatchBrowser {
+    this.api
+      .waitForElementVisible(selector)
+      .waitForElementPresent(`${selector} option[value="${contractName}"]`)
+      .click(`${selector} option[value="${contractName}"]`)
+      .perform(() => this.emit('complete'))
     return this
   }
 }
 
-function selectContract (browser: NightwatchBrowser, contractName: string, callback: VoidFunction) {
-  browser.click(`${selector} option[value="${contractName}"]`).perform(() => callback())
-}
-
 module.exports = SelectContract
diff --git a/apps/remix-ide-e2e/src/local-plugin/webpack.config.js b/apps/remix-ide-e2e/src/local-plugin/webpack.config.js
index 25932a1054..7e7efb4a60 100644
--- a/apps/remix-ide-e2e/src/local-plugin/webpack.config.js
+++ b/apps/remix-ide-e2e/src/local-plugin/webpack.config.js
@@ -8,7 +8,7 @@ module.exports = composePlugins(withNx(), (config) => {
   // add public path
   config.output.publicPath = '/'
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ["source-map-loader"],
diff --git a/apps/remix-ide-e2e/src/tests/layout.test.ts b/apps/remix-ide-e2e/src/tests/layout.test.ts
index 23398171d8..e267c0d5c0 100644
--- a/apps/remix-ide-e2e/src/tests/layout.test.ts
+++ b/apps/remix-ide-e2e/src/tests/layout.test.ts
@@ -26,7 +26,7 @@ module.exports = {
       .assert.containsText('.sidepanel h6[data-id="sidePanelSwapitTitle"]', 'SOLIDITY COMPILER')
       .waitForElementNotVisible('.pinned-panel h6[data-id="sidePanelSwapitTitle"]')
   },
-  'Should pin a plugin while a another plugin is already pinned': function (browser: NightwatchBrowser) {
+  'Should pin a plugin while an another plugin is already pinned': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('[data-id="movePluginToRight"]')
       .click('[data-id="movePluginToRight"]')
       .waitForElementVisible('[data-id="movePluginToLeft"]')
diff --git a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
index 1022471188..bd5ae67a16 100644
--- a/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
+++ b/apps/remix-ide-e2e/src/tests/migrateFileSystem.test.ts
@@ -101,7 +101,7 @@ module.exports = {
         browser.assert.equal(content, 'testing')
       })
   },
-  'Should have a artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an artifacts file with JSON test data #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .click('*[data-id="treeViewLitreeViewItemtest_contracts/artifacts"]')
       .openFile('test_contracts/artifacts/Storage_metadata.json')
@@ -111,7 +111,7 @@ module.exports = {
         browser.assert.equal(metadata.test, 'data')
       })
   },
-  'Should have a empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
+  'Should have an empty workspace #group1 #group3 #group5 #group7': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="remixIdeSidePanel"]', 5000)
       .switchWorkspace('emptyspace')
   },
diff --git a/apps/remix-ide-e2e/src/tests/quickDapp.test.ts b/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
index c557a9740c..ed1c9ffdda 100644
--- a/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
+++ b/apps/remix-ide-e2e/src/tests/quickDapp.test.ts
@@ -90,7 +90,7 @@ const tests = {
       .setValue('input[data-id="surgePassword"]', surgePassword)
       .setValue('input[data-id="surgeSubdomain"]', surgeSubdomain)
       .setValue('input[data-id="functionTitle0x6057361d"]', 'Function Store Title')
-      .setValue('input[data-id="functionTitle0x2e64cec1"]', 'Function Retrive Title')
+      .setValue('input[data-id="functionTitle0x2e64cec1"]', 'Function Retrieve Title')
       .execute((function() {
         document.querySelector('input[data-id="uploadLogo"]').classList.remove('d-none');
       }))
@@ -176,7 +176,7 @@ const tests = {
         })
       })
       .assert.containsText('*[data-id="functionTitle0x6057361d"]', 'Function Store Title')
-      .assert.containsText('*[data-id="functionTitle0x2e64cec1"]', 'Function Retrive Title')
+      .assert.containsText('*[data-id="functionTitle0x2e64cec1"]', 'Function Retrieve Title')
       .assert.containsText('*[data-id="dappTitle"]', 'Storage')
       .assert.containsText('*[data-id="dappInstructions"]', 'Store & retrieve value in a variable')
       .assert.elementPresent('.fa-twitter.btn', 'Twitter icon should be present')
@@ -191,9 +191,9 @@ const tests = {
       .getLocation('*[data-id="function0x6057361d"]', function (result: any) {
         const funcStoreLocation = result.value
         browser.getLocation('*[data-id="function0x2e64cec1"]', function (result: any) {
-          const funcRetriveLocation = result.value
-          browser.assert.strictEqual(funcStoreLocation.y, funcRetriveLocation.y, 'Both functions should be on the same horizontal line')
-          browser.assert.ok(funcStoreLocation.x > funcRetriveLocation.x, 'Function Store should be on the right of Function Retrive')
+          const funcRetrieveLocation = result.value
+          browser.assert.strictEqual(funcStoreLocation.y, funcRetrieveLocation.y, 'Both functions should be on the same horizontal line')
+          browser.assert.ok(funcStoreLocation.x > funcRetrieveLocation.x, 'Function Store should be on the right of Function Retrieve')
         })
       })
       .getAttribute('a[data-id="viewSourceCode"]', 'href', function (result) {
diff --git a/apps/remix-ide-e2e/src/tests/remixd.test.ts b/apps/remix-ide-e2e/src/tests/remixd.test.ts
index 31dc3c686b..6a0dedd582 100644
--- a/apps/remix-ide-e2e/src/tests/remixd.test.ts
+++ b/apps/remix-ide-e2e/src/tests/remixd.test.ts
@@ -527,7 +527,7 @@ async function installFoundry(): Promise<void> {
       server.stdout.on('data', function (data) {
         console.log(data.toString())
         if (
-          data.toString().includes("foundryup: done!")
+          data.toString().includes("foundryup: use - chisel 0.3.0")
         ) {
           console.log('resolving')
           resolve()
diff --git a/apps/remix-ide-e2e/src/tests/solidityImport.test.ts b/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
index 4f3c51a3a9..083f5bdf3f 100644
--- a/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityImport.test.ts
@@ -158,7 +158,7 @@ const sources = [
     'Untitled5.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/release-v2.3.0/contracts/token/ERC20/ERC20.sol"; contract test8 {}' }
   },
   {
-    'Untitled6.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol"; contract test10 {}' }
+    'Untitled6.sol': { content: 'import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol"; contract test10 {}' }
   },
   {
     'Untitled7.sol': { content: 'import "https://raw.githubusercontent.com/OpenZeppelin/openzeppelin-contracts/master/contracts/token/ERC20/ERC20.sol"; contract test11 {}' }
diff --git a/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts b/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
index 0a5942bd07..c9d2145105 100644
--- a/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
+++ b/apps/remix-ide-e2e/src/tests/specialFunctions.test.ts
@@ -7,7 +7,7 @@ module.exports = {
   before: function (browser: NightwatchBrowser, done: VoidFunction) {
     // this test suite also contribute testing https://github.com/ethereum/remix/pull/1497 and https://github.com/ethereum/remix-ide/pull/2898
     // quick explanation:
-    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts an not only the last one.
+    // the goal of https://github.com/ethereum/remix-ide/pull/2898 is to keep track of all the compiled contracts a not only the last one.
     // this introduce an issue: if 2 compiled contracts have the same name, the second one override the first which is not wanted.
     // fix's delivered by https://github.com/ethereum/remix/pull/1497: instead of getting contract by name,
     // which result in name clashing we process the whole contract object (which contain bytecode, deployedbytecode, ...)
diff --git a/apps/remix-ide-e2e/src/tests/terminal.test.ts b/apps/remix-ide-e2e/src/tests/terminal.test.ts
index 1d9292b50c..e16676e181 100644
--- a/apps/remix-ide-e2e/src/tests/terminal.test.ts
+++ b/apps/remix-ide-e2e/src/tests/terminal.test.ts
@@ -183,16 +183,41 @@ module.exports = {
       .selectContract('OwnerTest')
       .createContract('')
       .pause(1000)
-      .journalChildIncludes('constructor', { shouldHaveOnlyOneOccurence: true })
+      .journalChildIncludes('constructor', { shouldHaveOnlyOneOccurrence: true })
       .pause(5000)
       .click('*[data-id="terminalClearConsole"]') // clear the terminal
       .clickInstance(0)
       .clickFunction('changeOwner - transact (not payable)', { types: 'address newOwner', values: '0xd9145CCE52D386f254917e481eB44e9943F39138' })
       .pause(1000)
-      .journalChildIncludes('inside changeOwner', { shouldHaveOnlyOneOccurence: true })
+      .journalChildIncludes('inside changeOwner', { shouldHaveOnlyOneOccurrence: true })
       .clickFunction('getOwner - call')
       .pause(1000)
-      .journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurence: true })
+      .journalChildIncludes('inside getOwner', { shouldHaveOnlyOneOccurrence: true })
+  },
+
+  'Emit 2 similar events and check the filtering is done properly #group11': function (browser: NightwatchBrowser) {
+    let addressRef: string
+    browser
+      .addFile('contracts/contract_with_event.sol', { content: contract_with_event })
+      .pause(1000)
+      .openFile('contracts/contract_with_event.sol')
+      .clickLaunchIcon('solidity')
+      .click('*[data-id="compilerContainerCompileBtn"]')
+      .clickLaunchIcon('udapp')
+      .selectContract('Example')
+      .createContract('')
+      .getAddressAtPosition(0, (address) => {
+        addressRef = address
+        browser.addFile('scripts/test_filtering_event.ts', { content: test_filtering_event.replace('<ADDRESS>', addressRef) })
+          .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')')
+          .pause(1000)
+          .waitForElementContainsText('*[data-id="terminalJournal"]', '1')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'true')
+          .executeScriptInTerminal('remix.execute(\'scripts/test_filtering_event.ts\')') // re-emit the event
+          .waitForElementContainsText('*[data-id="terminalJournal"]', '2')
+          .waitForElementContainsText('*[data-id="terminalJournal"]', 'false')
+      })
+
   },
 
   'Should display auto-complete menu #group4': function (browser: NightwatchBrowser) {
@@ -357,7 +382,7 @@ module.exports = {
     }
 
     function resolveENS() view {
-        // Same address for Mainet, Ropsten, Rinkerby, Gorli and other networks;
+        // Same address for Mainnet, Ropsten, Rinkerby, Gorli and other networks;
         ENS ens = ENS(0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e);
         (,bytes32 node) = NameEncoder.dnsEncodeName("vitalik.eth");
         Resolver resolver = ens.resolver(node);
@@ -574,14 +599,14 @@ library Lib {
 }
 /**
  * @title Storage
- * @dev Store & retrieve value inr a variable
+ * @dev Store & retrieve value in a variable
  */
 contract StorageWithLib {
 
     uint256 number;
 
     /**
-     * @dev Store valrue in variable
+     * @dev Store value in variable
      * @param num value to store
      */
     function store(uint256 num) public {
@@ -722,7 +747,7 @@ const scriptAutoExec = {
 
   /**
    * @title Storage
-   * @dev Store & retrieve value inr a variable
+   * @dev Store & retrieve value in a variable
    * @custom:dev-run-script ./scripts/deploy_storage.js
    */
   contract Storage {
@@ -730,7 +755,7 @@ const scriptAutoExec = {
       uint256 number;
 
       /**
-       * @dev Store valrue in variable
+       * @dev Store value in variable
        * @param num value to store
        */
       function store(uint256 num) public {
@@ -834,4 +859,45 @@ const scriptBlockAndTransaction = `
 })()
 `
 
+const contract_with_event = `
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.2 <0.9.0;
+
+contract Example {
+    event TextMessage(address indexed, string);
+
+    function broadcastText(string calldata text, address dest) external {
+        emit TextMessage(dest, text);
+    }
+}
+`
+
+const test_filtering_event = `
+import { ethers } from 'ethers' // the version is v^5
+
+const test = async (accountIndex?: number) => {
+    const signer = (new ethers.providers.Web3Provider(web3Provider)).getSigner(accountIndex)
+    const contract = new ethers.Contract(contractAddr, contractABI, signer)
+    await Promise.all(dest.map(a => contract.broadcastText('hi!', a))) // here emit 2 logs with unique address
+    const filter = contract.filters.TextMessage(dest[1]) // here request one address
+
+    const logs = await contract.queryFilter(filter)
+    console.log(logs.length, logs.length === 1) // expected one, but actually two
+}
+
+const contractAddr = '<ADDRESS>'
+const contractABI = [
+    'event TextMessage(address indexed, string)',
+    'function broadcastText(string text, address dest)',
+]
+
+const dest = [
+    '0x27b07C05B74c45C8EBfc970aeF6B32180065e801',
+    '0xF2404a336381b2138b8D573e7F6b80445cc5F024',
+]
+
+test()
+`
+
 const byteCodeInSepolia = `0x6080604052600436106102ae5760003560e01c80637edb2c8111610175578063ba1842c5116100dc578063d2241c2711610095578063f2fde38b1161006f578063f2fde38b14610ab2578063f31b5b3314610adb578063f5839de114610af7578063f69b1b2914610b13576102ae565b8063d2241c2714610a21578063d5abeb0114610a4a578063e985e9c514610a75576102ae565b8063ba1842c5146108fd578063ba70e07514610926578063bd32fb6614610951578063c062977d1461097a578063c7eb4522146109bb578063c87b56dd146109e4576102ae565b8063a0bcfc7f1161012e578063a0bcfc7f14610803578063a22cb4651461082c578063aa98e0c614610855578063b37ee32814610880578063b61aa0e214610897578063b88d4fde146108d4576102ae565b80637edb2c811461070757806383b043e8146107305780638da5cb5b14610759578063938e15d51461078457806395d89b41146107ad5780639abc8320146107d8576102ae565b806342966c68116102195780636c302394116101d25780636c302394146105e75780636f8b44b01461062457806370a082311461064d578063715018a61461068a57806375fea21b146106a15780637696e088146106de576102ae565b806342966c68146104b5578063438b6300146104de578063451cadf61461051b578063474ffc47146105445780634f6ccce71461056d5780636352211e146105aa576102ae565b806318160ddd1161026b57806318160ddd146103c857806323b872dd146103f35780632f745c591461041c5780633ca81826146104595780633ccfd60b1461047557806342842e0e1461048c576102ae565b806301ffc9a7146102b357806306fdde03146102f0578063078a4cae1461031b578063081812fc14610337578063095ea7b314610374578063160e84321461039d575b600080fd5b3480156102bf57600080fd5b506102da60048036038101906102d59190613f85565b610b3e565b6040516102e79190613fcd565b60405180910390f35b3480156102fc57600080fd5b50610305610b50565b6040516103129190614078565b60405180910390f35b61033560048036038101906103309190614135565b610be2565b005b34801561034357600080fd5b5061035e60048036038101906103599190614195565b610ef5565b60405161036b9190614203565b60405180910390f35b34801561038057600080fd5b5061039b6004803603810190610396919061424a565b610f3b565b005b3480156103a957600080fd5b506103b2611052565b6040516103bf91906142a3565b60405180910390f35b3480156103d457600080fd5b506103dd611058565b6040516103ea91906142cd565b60405180910390f35b3480156103ff57600080fd5b5061041a600480360381019061041591906142e8565b611065565b005b34801561042857600080fd5b50610443600480360381019061043e919061424a565b6110c5565b60405161045091906142cd565b60405180910390f35b610473600480360381019061046e9190614135565b61116a565b005b34801561048157600080fd5b5061048a61147e565b005b34801561049857600080fd5b506104b360048036038101906104ae91906142e8565b611521565b005b3480156104c157600080fd5b506104dc60048036038101906104d79190614195565b611541565b005b3480156104ea57600080fd5b506105056004803603810190610500919061433b565b6115da565b6040516105129190614426565b60405180910390f35b34801561052757600080fd5b50610542600480360381019061053d9190614586565b611688565b005b34801561055057600080fd5b5061056b600480360381019061056691906145e2565b61177e565b005b34801561057957600080fd5b50610594600480360381019061058f9190614195565b6117a5565b6040516105a191906142cd565b60405180910390f35b3480156105b657600080fd5b506105d160048036038101906105cc9190614195565b611816565b6040516105de9190614203565b60405180910390f35b3480156105f357600080fd5b5061060e6004803603810190610609919061433b565b61189c565b60405161061b9190613fcd565b60405180910390f35b34801561063057600080fd5b5061064b60048036038101906106469190614195565b611946565b005b34801561065957600080fd5b50610674600480360381019061066f919061433b565b611958565b60405161068191906142cd565b60405180910390f35b34801561069657600080fd5b5061069f611a0f565b005b3480156106ad57600080fd5b506106c860048036038101906106c39190614195565b611a23565b6040516106d59190614203565b60405180910390f35b3480156106ea57600080fd5b50610705600480360381019061070091906145e2565b611a62565b005b34801561071357600080fd5b5061072e600480360381019061072991906145e2565b611a89565b005b34801561073c57600080fd5b506107576004803603810190610752919061464e565b611ab0565b005b34801561076557600080fd5b5061076e611ac2565b60405161077b9190614203565b60405180910390f35b34801561079057600080fd5b506107ab60048036038101906107a69190614730565b611aec565b005b3480156107b957600080fd5b506107c2611b8c565b6040516107cf9190614078565b60405180910390f35b3480156107e457600080fd5b506107ed611c1e565b6040516107fa9190614078565b60405180910390f35b34801561080f57600080fd5b5061082a600480360381019061082591906147d9565b611cac565b005b34801561083857600080fd5b50610853600480360381019061084e919061484e565b611cc7565b005b34801561086157600080fd5b5061086a611cdd565b60405161087791906142a3565b60405180910390f35b34801561088c57600080fd5b50610895611ce3565b005b3480156108a357600080fd5b506108be60048036038101906108b9919061433b565b611cfb565b6040516108cb91906142cd565b60405180910390f35b3480156108e057600080fd5b506108fb60048036038101906108f6919061492f565b611d13565b005b34801561090957600080fd5b50610924600480360381019061091f91906145e2565b611d75565b005b34801561093257600080fd5b5061093b611d9c565b60405161094891906142a3565b60405180910390f35b34801561095d57600080fd5b506109786004803603810190610973919061464e565b611da2565b005b34801561098657600080fd5b506109a1600480360381019061099c9190614195565b611db4565b6040516109b29594939291906149b2565b60405180910390f35b3480156109c757600080fd5b506109e260048036038101906109dd919061433b565b611e72565b005b3480156109f057600080fd5b50610a0b6004803603810190610a069190614195565b611ebe565b604051610a189190614078565b60405180910390f35b348015610a2d57600080fd5b50610a486004803603810190610a43919061464e565b611f26565b005b348015610a5657600080fd5b50610a5f611f38565b604051610a6c91906142cd565b60405180910390f35b348015610a8157600080fd5b50610a9c6004803603810190610a979190614a0c565b611f3e565b604051610aa99190613fcd565b60405180910390f35b348015610abe57600080fd5b50610ad96004803603810190610ad4919061433b565b611fd2565b005b610af56004803603810190610af09190614195565b612055565b005b610b116004803603810190610b0c9190614135565b6122d3565b005b348015610b1f57600080fd5b50610b286125e7565b604051610b359190614203565b60405180910390f35b6000610b498261260d565b9050919050565b606060008054610b5f90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054610b8b90614a7b565b8015610bd85780601f10610bad57610100808354040283529160200191610bd8565b820191906000526020600020905b815481529060010190602001808311610bbb57829003601f168201915b5050505050905090565b8282600e54610c59838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f820116905080830192505050505050508233604051602001610c3e9190614af4565b60405160208183030381529060405280519060200120612687565b610c98576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610c8f90614b81565b60405180910390fd5b610ca13361189c565b15610ce1576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610cd890614bed565b60405180910390fd5b600084600d5481610cf0611058565b610cfa9190614c3c565b1115610d3b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d3290614cbc565b60405180910390fd5b600081118015610d61575060116000838152602001908152602001600020600201548111155b610da0576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610d9790614d28565b60405180910390fd5b42601160008481526020019081526020016000206003015411158015610ddb5750426011600084815260200190815260200160002060040154115b610e1a576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e1190614d94565b60405180910390fd5b856011600080815260200190815260200160002060010154610e3c9190614db4565b341015610e7e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e7590614e42565b60405180910390fd5b610e88338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b6000610f00826126de565b6004600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6000610f4682611816565b90508073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610fb6576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610fad90614ed4565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff16610fd5612729565b73ffffffffffffffffffffffffffffffffffffffff161480611004575061100381610ffe612729565b611f3e565b5b611043576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161103a90614f66565b60405180910390fd5b61104d8383612731565b505050565b600e5481565b6000600880549050905090565b611076611070612729565b826127ea565b6110b5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016110ac90614ff8565b60405180910390fd5b6110c083838361287f565b505050565b60006110d083611958565b8210611111576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016111089061508a565b60405180910390fd5b600660008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600083815260200190815260200160002054905092915050565b82826010546111e1838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f8201169050808301925050505050505082336040516020016111c69190614af4565b60405160208183030381529060405280519060200120612687565b611220576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161121790614b81565b60405180910390fd5b6112293361189c565b15611269576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161126090614bed565b60405180910390fd5b600284600d5481611278611058565b6112829190614c3c565b11156112c3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016112ba90614cbc565b60405180910390fd5b6000811180156112e9575060116000838152602001908152602001600020600201548111155b611328576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161131f90614d28565b60405180910390fd5b426011600084815260200190815260200160002060030154111580156113635750426011600084815260200190815260200160002060040154115b6113a2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161139990614d94565b60405180910390fd5b856011600060028152602001908152602001600020600101546113c59190614db4565b341015611407576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016113fe90614e42565b60405180910390fd5b611411338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b611486612b78565b6000601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16476040516114ce906150db565b60006040518083038185875af1925050503d806000811461150b576040519150601f19603f3d011682016040523d82523d6000602084013e611510565b606091505b505090508061151e57600080fd5b50565b61153c83838360405180602001604052806000815250611d13565b505050565b61155261154c612729565b826127ea565b8061158f5750611560611ac2565b73ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b6115ce576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016115c590614ff8565b60405180910390fd5b6115d781612bf6565b50565b606060006115e783611958565b905060008167ffffffffffffffff81111561160557611604614448565b5b6040519080825280602002602001820160405280156116335781602001602082028036833780820191505090505b50905060005b8281101561167d5761164b85826110c5565b82828151811061165e5761165d6150f0565b5b60200260200101818152505080806116759061511f565b915050611639565b508092505050919050565b611690612b78565b600d548151836116a09190614db4565b6116a8611058565b6116b29190614c3c565b11156116f3576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016116ea90614cbc565b60405180910390fd5b60008211611736576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161172d90614d28565b60405180910390fd5b60005b815181101561177957611766828281518110611758576117576150f0565b5b60200260200101518461269e565b80806117719061511f565b915050611739565b505050565b611786612b78565b8060116000848152602001908152602001600020600401819055505050565b60006117af611058565b82106117f0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016117e7906151d9565b60405180910390fd5b60088281548110611804576118036150f0565b5b90600052602060002001549050919050565b60008061182283612d44565b9050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603611893576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161188a90615245565b60405180910390fd5b80915050919050565b6000805b60148054905081101561193b578273ffffffffffffffffffffffffffffffffffffffff16601482815481106118d8576118d76150f0565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1603611928576001915050611941565b80806119339061511f565b9150506118a0565b50600090505b919050565b61194e612b78565b80600d8190555050565b60008073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036119c8576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016119bf906152d7565b60405180910390fd5b600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b611a17612b78565b611a216000612d81565b565b60148181548110611a3357600080fd5b906000526020600020016000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b611a6a612b78565b8060116000848152602001908152602001600020600101819055505050565b611a91612b78565b8060116000848152602001908152602001600020600301819055505050565b611ab8612b78565b8060108190555050565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b611af4612b78565b84601160008881526020019081526020016000206000019081611b1791906154a3565b50836011600088815260200190815260200160002060010181905550826011600088815260200190815260200160002060020181905550816011600088815260200190815260200160002060030181905550806011600088815260200190815260200160002060040181905550505050505050565b606060018054611b9b90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611bc790614a7b565b8015611c145780601f10611be957610100808354040283529160200191611c14565b820191906000526020600020905b815481529060010190602001808311611bf757829003601f168201915b5050505050905090565b600c8054611c2b90614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611c5790614a7b565b8015611ca45780601f10611c7957610100808354040283529160200191611ca4565b820191906000526020600020905b815481529060010190602001808311611c8757829003601f168201915b505050505081565b611cb4612b78565b80600c9081611cc391906154a3565b5050565b611cd9611cd2612729565b8383612e47565b5050565b600f5481565b611ceb612b78565b60146000611cf99190613edb565b565b60126020528060005260406000206000915090505481565b611d24611d1e612729565b836127ea565b611d63576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401611d5a90614ff8565b60405180910390fd5b611d6f84848484612fb3565b50505050565b611d7d612b78565b8060116000848152602001908152602001600020600201819055505050565b60105481565b611daa612b78565b80600f8190555050565b6011602052806000526040600020600091509050806000018054611dd790614a7b565b80601f0160208091040260200160405190810160405280929190818152602001828054611e0390614a7b565b8015611e505780601f10611e2557610100808354040283529160200191611e50565b820191906000526020600020905b815481529060010190602001808311611e3357829003601f168201915b5050505050908060010154908060020154908060030154908060040154905085565b611e7a612b78565b80601360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6060611ec9826126de565b6000611ed361300f565b90506000815111611ef35760405180602001604052806000815250611f1e565b80611efd846130a1565b604051602001611f0e9291906155b1565b6040516020818303038152906040525b915050919050565b611f2e612b78565b80600e8190555050565b600d5481565b6000600560008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060009054906101000a900460ff16905092915050565b611fda612b78565b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603612049576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161204090615647565b60405180910390fd5b61205281612d81565b50565b600381600d5481612064611058565b61206e9190614c3c565b11156120af576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016120a690614cbc565b60405180910390fd5b6000811180156120d5575060116000838152602001908152602001600020600201548111155b612114576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161210b90614d28565b60405180910390fd5b4260116000848152602001908152602001600020600301541115801561214f5750426011600084815260200190815260200160002060040154115b61218e576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161218590614d94565b60405180910390fd5b42600f601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020546121db9190614c3c565b1061221b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612212906156b3565b60405180910390fd5b8260116000600381526020019081526020016000206001015461223e9190614db4565b341015612280576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161227790614e42565b60405180910390fd5b61228a338461269e565b42601260003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550505050565b8282600f5461234a838380806020026020016040519081016040528093929190818152602001838360200280828437600081840152601f19601f82011690508083019250505050505050823360405160200161232f9190614af4565b60405160208183030381529060405280519060200120612687565b612389576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161238090614b81565b60405180910390fd5b6123923361189c565b156123d2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016123c990614bed565b60405180910390fd5b600184600d54816123e1611058565b6123eb9190614c3c565b111561242c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161242390614cbc565b60405180910390fd5b600081118015612452575060116000838152602001908152602001600020600201548111155b612491576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161248890614d28565b60405180910390fd5b426011600084815260200190815260200160002060030154111580156124cc5750426011600084815260200190815260200160002060040154115b61250b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161250290614d94565b60405180910390fd5b8560116000600181526020019081526020016000206001015461252e9190614db4565b341015612570576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161256790614e42565b60405180910390fd5b61257a338761269e565b6014339080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050505050505050565b601360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60007f780e9d63000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161480612680575061267f8261316f565b5b9050919050565b6000826126948584613251565b1490509392505050565b60005b818110156126d9576126b3600b6132a7565b6126c6836126c1600b6132bd565b6132cb565b80806126d19061511f565b9150506126a1565b505050565b6126e7816132e9565b612726576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161271d90615245565b60405180910390fd5b50565b600033905090565b816004600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff166127a483611816565b73ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b92560405160405180910390a45050565b6000806127f683611816565b90508073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16148061283857506128378185611f3e565b5b8061287657508373ffffffffffffffffffffffffffffffffffffffff1661285e84610ef5565b73ffffffffffffffffffffffffffffffffffffffff16145b91505092915050565b8273ffffffffffffffffffffffffffffffffffffffff1661289f82611816565b73ffffffffffffffffffffffffffffffffffffffff16146128f5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016128ec90615745565b60405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603612964576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161295b906157d7565b60405180910390fd5b612971838383600161332a565b8273ffffffffffffffffffffffffffffffffffffffff1661299182611816565b73ffffffffffffffffffffffffffffffffffffffff16146129e7576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016129de90615745565b60405180910390fd5b6004600082815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055506001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4612b738383836001613488565b505050565b612b80612729565b73ffffffffffffffffffffffffffffffffffffffff16612b9e611ac2565b73ffffffffffffffffffffffffffffffffffffffff1614612bf4576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612beb90615843565b60405180910390fd5b565b6000612c0182611816565b9050612c1181600084600161332a565b612c1a82611816565b90506004600083815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556001600360008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825403925050819055506002600083815260200190815260200160002060006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905581600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4612d40816000846001613488565b5050565b60006002600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050919050565b6000600a60009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905081600a60006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508173ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a35050565b8173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603612eb5576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401612eac906158af565b60405180910390fd5b80600560008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060006101000a81548160ff0219169083151502179055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c3183604051612fa69190613fcd565b60405180910390a3505050565b612fbe84848461287f565b612fca8484848461348e565b613009576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161300090615941565b60405180910390fd5b50505050565b6060600c805461301e90614a7b565b80601f016020809104026020016040519081016040528092919081815260200182805461304a90614a7b565b80156130975780601f1061306c57610100808354040283529160200191613097565b820191906000526020600020905b81548152906001019060200180831161307a57829003601f168201915b5050505050905090565b6060600060016130b084613615565b01905060008167ffffffffffffffff8111156130cf576130ce614448565b5b6040519080825280601f01601f1916602001820160405280156131015781602001600182028036833780820191505090505b509050600082602001820190505b600115613164578080600190039150507f3031323334353637383961626364656600000000000000000000000000000000600a86061a8153600a858161315857613157615961565b5b0494506000850361310f575b819350505050919050565b60007f80ac58cd000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916148061323a57507f5b5e139f000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916145b8061324a575061324982613768565b5b9050919050565b60008082905060005b845181101561329c576132878286838151811061327a576132796150f0565b5b60200260200101516137d2565b915080806132949061511f565b91505061325a565b508091505092915050565b6001816000016000828254019250508190555050565b600081600001549050919050565b6132e58282604051806020016040528060008152506137fd565b5050565b60008073ffffffffffffffffffffffffffffffffffffffff1661330b83612d44565b73ffffffffffffffffffffffffffffffffffffffff1614159050919050565b61333684848484613858565b600181111561337a576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161337190615a02565b60405180910390fd5b6000829050600073ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16036133c1576133bc8161397e565b613400565b8373ffffffffffffffffffffffffffffffffffffffff168573ffffffffffffffffffffffffffffffffffffffff16146133ff576133fe85826139c7565b5b5b600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16036134425761343d81613b34565b613481565b8473ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16146134805761347f8482613c05565b5b5b5050505050565b50505050565b60006134af8473ffffffffffffffffffffffffffffffffffffffff16613c84565b15613608578373ffffffffffffffffffffffffffffffffffffffff1663150b7a026134d8612729565b8786866040518563ffffffff1660e01b81526004016134fa9493929190615a77565b6020604051808303816000875af192505050801561353657506040513d601f19601f820116820180604052508101906135339190615ad8565b60015b6135b8573d8060008114613566576040519150601f19603f3d011682016040523d82523d6000602084013e61356b565b606091505b5060008151036135b0576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016135a790615941565b60405180910390fd5b805181602001fd5b63150b7a0260e01b7bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19161491505061360d565b600190505b949350505050565b600080600090507a184f03e93ff9f4daa797ed6e38ed64bf6a1f0100000000000000008310613673577a184f03e93ff9f4daa797ed6e38ed64bf6a1f010000000000000000838161366957613668615961565b5b0492506040810190505b6d04ee2d6d415b85acef810000000083106136b0576d04ee2d6d415b85acef810000000083816136a6576136a5615961565b5b0492506020810190505b662386f26fc1000083106136df57662386f26fc1000083816136d5576136d4615961565b5b0492506010810190505b6305f5e1008310613708576305f5e10083816136fe576136fd615961565b5b0492506008810190505b612710831061372d57612710838161372357613722615961565b5b0492506004810190505b60648310613750576064838161374657613745615961565b5b0492506002810190505b600a831061375f576001810190505b80915050919050565b60007f01ffc9a7000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916827bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916149050919050565b60008183106137ea576137e58284613ca7565b6137f5565b6137f48383613ca7565b5b905092915050565b6138078383613cbe565b613814600084848461348e565b613853576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161384a90615941565b60405180910390fd5b505050565b600181111561397857600073ffffffffffffffffffffffffffffffffffffffff168473ffffffffffffffffffffffffffffffffffffffff16146138ec5780600360008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282546138e49190615b05565b925050819055505b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16146139775780600360008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600082825461396f9190614c3c565b925050819055505b5b50505050565b6008805490506009600083815260200190815260200160002081905550600881908060018154018082558091505060019003906000526020600020016000909190919091505550565b600060016139d484611958565b6139de9190615b05565b9050600060076000848152602001908152602001600020549050818114613ac3576000600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600084815260200190815260200160002054905080600660008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600084815260200190815260200160002081905550816007600083815260200190815260200160002081905550505b6007600084815260200190815260200160002060009055600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008381526020019081526020016000206000905550505050565b60006001600880549050613b489190615b05565b9050600060096000848152602001908152602001600020549050600060088381548110613b7857613b776150f0565b5b906000526020600020015490508060088381548110613b9a57613b996150f0565b5b906000526020600020018190555081600960008381526020019081526020016000208190555060096000858152602001908152602001600020600090556008805480613be957613be8615b39565b5b6001900381819060005260206000200160009055905550505050565b6000613c1083611958565b905081600660008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600083815260200190815260200160002081905550806007600084815260200190815260200160002081905550505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b600082600052816020526040600020905092915050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603613d2d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613d2490615bb4565b60405180910390fd5b613d36816132e9565b15613d76576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613d6d90615c20565b60405180910390fd5b613d8460008383600161332a565b613d8d816132e9565b15613dcd576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401613dc490615c20565b60405180910390fd5b6001600360008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540192505081905550816002600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550808273ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef60405160405180910390a4613ed7600083836001613488565b5050565b5080546000825590600052602060002090810190613ef99190613efc565b50565b5b80821115613f15576000816000905550600101613efd565b5090565b6000604051905090565b600080fd5b600080fd5b60007fffffffff0000000000000000000000000000000000000000000000000000000082169050919050565b613f6281613f2d565b8114613f6d57600080fd5b50565b600081359050613f7f81613f59565b92915050565b600060208284031215613f9b57613f9a613f23565b5b6000613fa984828501613f70565b91505092915050565b60008115159050919050565b613fc781613fb2565b82525050565b6000602082019050613fe26000830184613fbe565b92915050565b600081519050919050565b600082825260208201905092915050565b60005b83811015614022578082015181840152602081019050614007565b60008484015250505050565b6000601f19601f8301169050919050565b600061404a82613fe8565b6140548185613ff3565b9350614064818560208601614004565b61406d8161402e565b840191505092915050565b60006020820190508181036000830152614092818461403f565b905092915050565b600080fd5b600080fd5b600080fd5b60008083601f8401126140bf576140be61409a565b5b8235905067ffffffffffffffff8111156140dc576140db61409f565b5b6020830191508360208202830111156140f8576140f76140a4565b5b9250929050565b6000819050919050565b614112816140ff565b811461411d57600080fd5b50565b60008135905061412f81614109565b92915050565b60008060006040848603121561414e5761414d613f23565b5b600084013567ffffffffffffffff81111561416c5761416b613f28565b5b614178868287016140a9565b9350935050602061418b86828701614120565b9150509250925092565b6000602082840312156141ab576141aa613f23565b5b60006141b984828501614120565b91505092915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006141ed826141c2565b9050919050565b6141fd816141e2565b82525050565b600060208201905061421860008301846141f4565b92915050565b614227816141e2565b811461423257600080fd5b50565b6000813590506142448161421e565b92915050565b6000806040838503121561426157614260613f23565b5b600061426f85828601614235565b925050602061428085828601614120565b9150509250929050565b6000819050919050565b61429d8161428a565b82525050565b60006020820190506142b86000830184614294565b92915050565b6142c7816140ff565b82525050565b60006020820190506142e260008301846142be565b92915050565b60008060006060848603121561430157614300613f23565b5b600061430f86828701614235565b935050602061432086828701614235565b925050604061433186828701614120565b9150509250925092565b60006020828403121561435157614350613f23565b5b600061435f84828501614235565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b61439d816140ff565b82525050565b60006143af8383614394565b60208301905092915050565b6000602082019050919050565b60006143d382614368565b6143dd8185614373565b93506143e883614384565b8060005b8381101561441957815161440088826143a3565b975061440b836143bb565b9250506001810190506143ec565b5085935050505092915050565b6000602082019050818103600083015261444081846143c8565b905092915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6144808261402e565b810181811067ffffffffffffffff8211171561449f5761449e614448565b5b80604052505050565b60006144b2613f19565b90506144be8282614477565b919050565b600067ffffffffffffffff8211156144de576144dd614448565b5b602082029050602081019050919050565b60006145026144fd846144c3565b6144a8565b90508083825260208201905060208402830185811115614525576145246140a4565b5b835b8181101561454e578061453a8882614235565b845260208401935050602081019050614527565b5050509392505050565b600082601f83011261456d5761456c61409a565b5b813561457d8482602086016144ef565b91505092915050565b6000806040838503121561459d5761459c613f23565b5b60006145ab85828601614120565b925050602083013567ffffffffffffffff8111156145cc576145cb613f28565b5b6145d885828601614558565b9150509250929050565b600080604083850312156145f9576145f8613f23565b5b600061460785828601614120565b925050602061461885828601614120565b9150509250929050565b61462b8161428a565b811461463657600080fd5b50565b60008135905061464881614622565b92915050565b60006020828403121561466457614663613f23565b5b600061467284828501614639565b91505092915050565b600080fd5b600067ffffffffffffffff82111561469b5761469a614448565b5b6146a48261402e565b9050602081019050919050565b82818337600083830152505050565b60006146d36146ce84614680565b6144a8565b9050828152602081018484840111156146ef576146ee61467b565b5b6146fa8482856146b1565b509392505050565b600082601f8301126147175761471661409a565b5b81356147278482602086016146c0565b91505092915050565b60008060008060008060c0878903121561474d5761474c613f23565b5b600061475b89828a01614120565b965050602087013567ffffffffffffffff81111561477c5761477b613f28565b5b61478889828a01614702565b955050604061479989828a01614120565b94505060606147aa89828a01614120565b93505060806147bb89828a01614120565b92505060a06147cc89828a01614120565b9150509295509295509295565b6000602082840312156147ef576147ee613f23565b5b600082013567ffffffffffffffff81111561480d5761480c613f28565b5b61481984828501614702565b91505092915050565b61482b81613fb2565b811461483657600080fd5b50565b60008135905061484881614822565b92915050565b6000806040838503121561486557614864613f23565b5b600061487385828601614235565b925050602061488485828601614839565b9150509250929050565b600067ffffffffffffffff8211156148a9576148a8614448565b5b6148b28261402e565b9050602081019050919050565b60006148d26148cd8461488e565b6144a8565b9050828152602081018484840111156148ee576148ed61467b565b5b6148f98482856146b1565b509392505050565b600082601f8301126149165761491561409a565b5b81356149268482602086016148bf565b91505092915050565b6000806000806080858703121561494957614948613f23565b5b600061495787828801614235565b945050602061496887828801614235565b935050604061497987828801614120565b925050606085013567ffffffffffffffff81111561499a57614999613f28565b5b6149a687828801614901565b91505092959194509250565b600060a08201905081810360008301526149cc818861403f565b90506149db60208301876142be565b6149e860408301866142be565b6149f560608301856142be565b614a0260808301846142be565b9695505050505050565b60008060408385031215614a2357614a22613f23565b5b6000614a3185828601614235565b9250506020614a4285828601614235565b9150509250929050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b60006002820490506001821680614a9357607f821691505b602082108103614aa657614aa5614a4c565b5b50919050565b60008160601b9050919050565b6000614ac482614aac565b9050919050565b6000614ad682614ab9565b9050919050565b614aee614ae9826141e2565b614acb565b82525050565b6000614b008284614add565b60148201915081905092915050565b7f4164647265737320646f6573206e6f7420657869737420696e204d696e746c6960008201527f7374210000000000000000000000000000000000000000000000000000000000602082015250565b6000614b6b602383613ff3565b9150614b7682614b0f565b604082019050919050565b60006020820190508181036000830152614b9a81614b5e565b9050919050565b7f416c65616479204d696e74656421000000000000000000000000000000000000600082015250565b6000614bd7600e83613ff3565b9150614be282614ba1565b602082019050919050565b60006020820190508181036000830152614c0681614bca565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b6000614c47826140ff565b9150614c52836140ff565b9250828201905080821115614c6a57614c69614c0d565b5b92915050565b7f4d617820737570706c7920657863656564656421000000000000000000000000600082015250565b6000614ca6601483613ff3565b9150614cb182614c70565b602082019050919050565b60006020820190508181036000830152614cd581614c99565b9050919050565b7f496e76616c6964206d696e7420616d6f756e7421000000000000000000000000600082015250565b6000614d12601483613ff3565b9150614d1d82614cdc565b602082019050919050565b60006020820190508181036000830152614d4181614d05565b9050919050565b7f53616c6573206973206e6f742079657421000000000000000000000000000000600082015250565b6000614d7e601183613ff3565b9150614d8982614d48565b602082019050919050565b60006020820190508181036000830152614dad81614d71565b9050919050565b6000614dbf826140ff565b9150614dca836140ff565b9250828202614dd8816140ff565b91508282048414831517614def57614dee614c0d565b5b5092915050565b7f496e73756666696369656e742066756e64732100000000000000000000000000600082015250565b6000614e2c601383613ff3565b9150614e3782614df6565b602082019050919050565b60006020820190508181036000830152614e5b81614e1f565b9050919050565b7f4552433732313a20617070726f76616c20746f2063757272656e74206f776e6560008201527f7200000000000000000000000000000000000000000000000000000000000000602082015250565b6000614ebe602183613ff3565b9150614ec982614e62565b604082019050919050565b60006020820190508181036000830152614eed81614eb1565b9050919050565b7f4552433732313a20617070726f76652063616c6c6572206973206e6f7420746f60008201527f6b656e206f776e6572206f7220617070726f76656420666f7220616c6c000000602082015250565b6000614f50603d83613ff3565b9150614f5b82614ef4565b604082019050919050565b60006020820190508181036000830152614f7f81614f43565b9050919050565b7f4552433732313a2063616c6c6572206973206e6f7420746f6b656e206f776e6560008201527f72206f7220617070726f76656400000000000000000000000000000000000000602082015250565b6000614fe2602d83613ff3565b9150614fed82614f86565b604082019050919050565b6000602082019050818103600083015261501181614fd5565b9050919050565b7f455243373231456e756d657261626c653a206f776e657220696e646578206f7560008201527f74206f6620626f756e6473000000000000000000000000000000000000000000602082015250565b6000615074602b83613ff3565b915061507f82615018565b604082019050919050565b600060208201905081810360008301526150a381615067565b9050919050565b600081905092915050565b50565b60006150c56000836150aa565b91506150d0826150b5565b600082019050919050565b60006150e6826150b8565b9150819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600061512a826140ff565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff820361515c5761515b614c0d565b5b600182019050919050565b7f455243373231456e756d657261626c653a20676c6f62616c20696e646578206f60008201527f7574206f6620626f756e64730000000000000000000000000000000000000000602082015250565b60006151c3602c83613ff3565b91506151ce82615167565b604082019050919050565b600060208201905081810360008301526151f2816151b6565b9050919050565b7f4552433732313a20696e76616c696420746f6b656e2049440000000000000000600082015250565b600061522f601883613ff3565b915061523a826151f9565b602082019050919050565b6000602082019050818103600083015261525e81615222565b9050919050565b7f4552433732313a2061646472657373207a65726f206973206e6f74206120766160008201527f6c6964206f776e65720000000000000000000000000000000000000000000000602082015250565b60006152c1602983613ff3565b91506152cc82615265565b604082019050919050565b600060208201905081810360008301526152f0816152b4565b9050919050565b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b6000600883026153597fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8261531c565b615363868361531c565b95508019841693508086168417925050509392505050565b6000819050919050565b60006153a061539b615396846140ff565b61537b565b6140ff565b9050919050565b6000819050919050565b6153ba83615385565b6153ce6153c6826153a7565b848454615329565b825550505050565b600090565b6153e36153d6565b6153ee8184846153b1565b505050565b5b81811015615412576154076000826153db565b6001810190506153f4565b5050565b601f82111561545757615428816152f7565b6154318461530c565b81016020851015615440578190505b61545461544c8561530c565b8301826153f3565b50505b505050565b600082821c905092915050565b600061547a6000198460080261545c565b1980831691505092915050565b60006154938383615469565b9150826002028217905092915050565b6154ac82613fe8565b67ffffffffffffffff8111156154c5576154c4614448565b5b6154cf8254614a7b565b6154da828285615416565b600060209050601f83116001811461550d57600084156154fb578287015190505b6155058582615487565b86555061556d565b601f19841661551b866152f7565b60005b828110156155435784890151825560018201915060208501945060208101905061551e565b86831015615560578489015161555c601f891682615469565b8355505b6001600288020188555050505b505050505050565b600081905092915050565b600061558b82613fe8565b6155958185615575565b93506155a5818560208601614004565b80840191505092915050565b60006155bd8285615580565b91506155c98284615580565b91508190509392505050565b7f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160008201527f6464726573730000000000000000000000000000000000000000000000000000602082015250565b6000615631602683613ff3565b915061563c826155d5565b604082019050919050565b6000602082019050818103600083015261566081615624565b9050919050565b7f426f74206973206e6f7420616c6c6f7765643a00000000000000000000000000600082015250565b600061569d601383613ff3565b91506156a882615667565b602082019050919050565b600060208201905081810360008301526156cc81615690565b9050919050565b7f4552433732313a207472616e736665722066726f6d20696e636f72726563742060008201527f6f776e6572000000000000000000000000000000000000000000000000000000602082015250565b600061572f602583613ff3565b915061573a826156d3565b604082019050919050565b6000602082019050818103600083015261575e81615722565b9050919050565b7f4552433732313a207472616e7366657220746f20746865207a65726f2061646460008201527f7265737300000000000000000000000000000000000000000000000000000000602082015250565b60006157c1602483613ff3565b91506157cc82615765565b604082019050919050565b600060208201905081810360008301526157f0816157b4565b9050919050565b7f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e6572600082015250565b600061582d602083613ff3565b9150615838826157f7565b602082019050919050565b6000602082019050818103600083015261585c81615820565b9050919050565b7f4552433732313a20617070726f766520746f2063616c6c657200000000000000600082015250565b6000615899601983613ff3565b91506158a482615863565b602082019050919050565b600060208201905081810360008301526158c88161588c565b9050919050565b7f4552433732313a207472616e7366657220746f206e6f6e20455243373231526560008201527f63656976657220696d706c656d656e7465720000000000000000000000000000602082015250565b600061592b603283613ff3565b9150615936826158cf565b604082019050919050565b6000602082019050818103600083015261595a8161591e565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601260045260246000fd5b7f455243373231456e756d657261626c653a20636f6e736563757469766520747260008201527f616e7366657273206e6f7420737570706f727465640000000000000000000000602082015250565b60006159ec603583613ff3565b91506159f782615990565b604082019050919050565b60006020820190508181036000830152615a1b816159df565b9050919050565b600081519050919050565b600082825260208201905092915050565b6000615a4982615a22565b615a538185615a2d565b9350615a63818560208601614004565b615a6c8161402e565b840191505092915050565b6000608082019050615a8c60008301876141f4565b615a9960208301866141f4565b615aa660408301856142be565b8181036060830152615ab88184615a3e565b905095945050505050565b600081519050615ad281613f59565b92915050565b600060208284031215615aee57615aed613f23565b5b6000615afc84828501615ac3565b91505092915050565b6000615b10826140ff565b9150615b1b836140ff565b9250828203905081811115615b3357615b32614c0d565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b7f4552433732313a206d696e7420746f20746865207a65726f2061646472657373600082015250565b6000615b9e602083613ff3565b9150615ba982615b68565b602082019050919050565b60006020820190508181036000830152615bcd81615b91565b9050919050565b7f4552433732313a20746f6b656e20616c7265616479206d696e74656400000000600082015250565b6000615c0a601c83613ff3565b9150615c1582615bd4565b602082019050919050565b60006020820190508181036000830152615c3981615bfd565b905091905056fea2646970667358221220cab453c54d0f54378c32d8041ca80fa3466bf7165db0242b387ea2433b3f619264736f6c63430008110033`
diff --git a/apps/remix-ide-e2e/src/tests/vm_state.test.ts b/apps/remix-ide-e2e/src/tests/vm_state.test.ts
new file mode 100644
index 0000000000..2c02750859
--- /dev/null
+++ b/apps/remix-ide-e2e/src/tests/vm_state.test.ts
@@ -0,0 +1,154 @@
+'use strict'
+import { NightwatchBrowser } from 'nightwatch'
+import init from '../helpers/init'
+
+declare global {
+  interface Window { testplugin: { name: string, url: string }; }
+}
+
+const tests = {
+  '@disabled': true,
+  before: function (browser: NightwatchBrowser, done: VoidFunction) {
+    init(browser, done, null)
+  },
+
+  'Should show fork and delete VM state icons #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('udapp')
+      .waitForElementVisible('*[data-id="selected-provider-vm-cancun"]')
+      .waitForElementVisible('*[data-id="fork-state-icon"]')
+      .waitForElementVisible('*[data-id="delete-state-icon"]')
+  },
+  'Should show toaster while trying fork and delete VM state without state #group1': function (browser: NightwatchBrowser) {
+    browser
+      .waitForElementVisible('*[data-id="fork-state-icon"]')
+      .click('*[data-id="fork-state-icon"]')
+      .waitForElementVisible(
+        {
+          selector: "//*[@data-shared='tooltipPopup' and contains(.,'State not available to fork')]",
+          locateStrategy: 'xpath'
+        }
+      )
+      .waitForElementVisible('*[data-id="delete-state-icon"]')
+      .click('*[data-id="delete-state-icon"]')
+      .waitForElementVisible(
+        {
+          selector: "//*[@data-shared='tooltipPopup' and contains(.,'State not available to reset')]",
+          locateStrategy: 'xpath'
+        }
+      )
+  },
+  'Should fork state successfully #group1': function (browser: NightwatchBrowser) {
+    browser
+      .openFile('contracts')
+      .openFile('contracts/1_Storage.sol')
+      .verifyContracts(['Storage'])
+      .clickLaunchIcon('udapp')
+      .click('[data-id="Deploy - transact (not payable)"]')
+      .clickInstance(0)
+      .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '"55"' })
+      .testFunction('last',
+        {
+          status: '0x1 Transaction mined and execution succeed',
+          'decoded input': { 'uint256 num': '55' }
+        })
+      .clickFunction('retrieve - call')
+      .testFunction('last',
+        {
+          'decoded output': { '0': 'uint256: 55' }
+        })
+      .click('*[data-id="fork-state-icon"]')
+      .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
+      .click('input[data-id="modalDialogForkState"]')
+      .setValue('input[data-id="modalDialogForkState"]', 'forkedState_1')
+      .modalFooterOKClick('udappNotify')
+      // check toaster for forked state
+      .waitForElementVisible(
+        {
+          selector: '//*[@data-shared="tooltipPopup" and contains(.,"New environment \'forkedState_1\' created with forked state.")]',
+          locateStrategy: 'xpath'
+        }
+      )
+      // check if forked state is selected as current environment
+      .assert.elementPresent('*[data-id="selected-provider-vm-fs-forkedState_1"]')
+      // check if forked state file is created with expected details
+      .openFile('.states/forked_states/forkedState_1.json')
+      .getEditorValue((content) => {
+        browser.assert.ok(content.indexOf(`"latestBlockNumber": "0x2"`) !== -1)
+        browser.assert.ok(content.indexOf(`"stateName": "forkedState_1"`) !== -1)
+        browser.assert.ok(content.indexOf(`"forkName": "cancun"`) !== -1)
+        browser.assert.ok(content.indexOf(`"savingTimestamp":`) !== -1)
+        browser.assert.ok(content.indexOf(`"db":`) !== -1)
+        browser.assert.ok(content.indexOf(`"blocks":`) !== -1)
+      })
+  },
+  'Should show fork states provider in environment explorer & make txs using forked state #group1': function (browser: NightwatchBrowser) {
+    browser
+      .clickLaunchIcon('udapp')
+      .waitForElementVisible('[data-id="settingsSelectEnvOptions"]')
+      .click('[data-id="settingsSelectEnvOptions"] button')
+      .waitForElementVisible(`[data-id="dropdown-item-another-chain"]`)
+      .click(`[data-id="dropdown-item-another-chain"]`)
+      .assert.visible('[data-id="remixUIGSDeploy to an In-browser Forked State."]')
+      .assert.elementPresent('[data-id="remixUIGSforkedState_1"]')
+      .assert.elementPresent('[data-id="vm-fs-forkedState_1-pinned"]')
+      .assert.textContains('[data-id="vm-fs-forkedState_1desc"]', 'Latest Block: 2')
+      .assert.not.elementPresent('[data-id="remixUIGSforkedState_2"]')
+      .switchEnvironment('vm-cancun')
+      .openFile('contracts/1_Storage.sol')
+      .verifyContracts(['Storage'])
+      .clickLaunchIcon('udapp')
+      .click('*[data-id="Deploy - transact (not payable)"]')
+      .click('*[data-id="fork-state-icon"]')
+      .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
+      .click('input[data-id="modalDialogForkState"]')
+      .setValue('input[data-id="modalDialogForkState"]', 'forkedState_2')
+      .modalFooterOKClick('udappNotify')
+      .waitForElementVisible('*[data-shared="tooltipPopup"]', 10000)
+      .assert.textContains('*[data-shared="tooltipPopup"]', `New environment 'forkedState_2' created with forked state.`)
+      // check if 'forkedState_2' is selected as current environment 
+      .assert.elementPresent('*[data-id="selected-provider-vm-fs-forkedState_2"]')
+      // check if 'forkedState_2' is present in environment explorer
+      .assert.elementPresent('[data-id="remixUIGSforkedState_2"]')
+      // check if 'forkedState_2' is pinned in environment explorer
+      .assert.elementPresent('[data-id="vm-fs-forkedState_2-pinned"]')
+      // 'forkedState_2' should have 3 blocks
+      .assert.textContains('[data-id="vm-fs-forkedState_2desc"]', 'Latest Block: 3')
+      .click('*[data-id="Deploy - transact (not payable)"]')
+      .clickInstance(0)
+      .clickFunction('store - transact (not payable)', { types: 'uint256 num', values: '"555"' })
+      // block number should be 5 after 2 txs
+      .testFunction('last',
+        {
+          status: '0x1 Transaction mined and execution succeed',
+          'block number': '5',
+          'decoded input': { 'uint256 num': '555' }
+        })
+  },
+  'Should delete state successfully #group1': function (browser: NightwatchBrowser) {
+    browser
+      .switchEnvironment('vm-cancun')
+      .openFile('contracts/1_Storage.sol')
+      .verifyContracts(['Storage'])
+      .clickLaunchIcon('udapp')
+      .click('*[data-id="Deploy - transact (not payable)"]')
+      .pause(10000)
+      .assert.textContains('*[data-id="deployedContractsBadge"]', '1')
+      .click(('*[data-id="delete-state-icon"]'))
+      .waitForElementVisible('*[data-id="udappNotifyModalDialogModalTitle-react"]')
+      .waitForElementVisible('*[data-id="deleteVmStateModal"]')
+      .modalFooterOKClick('udappNotify')
+      .waitForElementVisible('*[data-shared="tooltipPopup"]', 10000)
+      // check if toaster is shown
+      .assert.textContains('*[data-shared="tooltipPopup"]', `VM state reset successfully.`)
+      // check that there are no instances
+      .assert.textContains('*[data-id="deployedContractsBadge"]', '0')
+      // check if state file is deleted
+      .openFile('.states/vm-cancun')
+      .assert.not.elementPresent('*[data-id="treeViewDivDraggableItem.states/vm-cancun/state.json"]')
+  }
+}
+
+module.exports = {
+  ...tests
+};
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 c495ce11b8..437d54dbb9 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -434,7 +434,7 @@ module.exports = {
       .click('*[data-id="saveGitHubCredentials"]')
       .modalFooterOKClick('github-credentials-error')
   },
-  'check source controle panel #group5': function (browser: NightwatchBrowser) {
+  'check source control panel #group5': function (browser: NightwatchBrowser) {
     browser
       .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
       .click('*[data-id="sourcecontrol-panel"]')
@@ -448,7 +448,7 @@ module.exports = {
       .clickLaunchIcon('filePanel')
       .switchWorkspace('default_workspace')
   },
-  'check source controle panel again #group5': function (browser: NightwatchBrowser) {
+  'check source control panel again #group5': function (browser: NightwatchBrowser) {
     browser
       .pause(1000)
       .clickLaunchIcon('dgit')
@@ -485,7 +485,7 @@ module.exports = {
           'Incorrect content')
       })
   },
-  'check source controle panel for uniswap #group5': function (browser: NightwatchBrowser) {
+  'check source control panel for uniswap #group5': function (browser: NightwatchBrowser) {
     browser
       .pause(5000)
       .clickLaunchIcon('dgit')
diff --git a/apps/remix-ide-e2e/src/types/index.d.ts b/apps/remix-ide-e2e/src/types/index.d.ts
index 5c6d3bd262..f6f9213dd1 100644
--- a/apps/remix-ide-e2e/src/types/index.d.ts
+++ b/apps/remix-ide-e2e/src/types/index.d.ts
@@ -25,7 +25,7 @@ declare module 'nightwatch' {
     journalLastChildIncludes(val: string): NightwatchBrowser
     executeScriptInTerminal(script: string): NightwatchBrowser
     clearEditableContent(cssSelector: string): NightwatchBrowser
-    journalChildIncludes(val: string, opts = {shouldHaveOnlyOneOccurence: boolean}): NightwatchBrowser
+    journalChildIncludes(val: string, opts = {shouldHaveOnlyOneOccurrence: boolean}): NightwatchBrowser
     debugTransaction(index: number): NightwatchBrowser
     checkElementStyle(cssSelector: string, styleProperty: string, expectedResult: string): NightwatchBrowser
     openFile(name: string): NightwatchBrowser
@@ -57,7 +57,7 @@ declare module 'nightwatch' {
     journalLastChild(val: string): NightwatchBrowser
     checkTerminalFilter(filter: string, test: string, notContain: boolean): NightwatchBrowser
     noWorkerErrorFor(version: string): NightwatchBrowser
-    validateValueInput(selector: string, valueTosSet: string[], expectedValue: string): NightwatchBrowser
+    validateValueInput(selector: string, valueToSet: string[], expectedValue: string): NightwatchBrowser
     checkAnnotations(type: string): NightwatchBrowser
     checkAnnotationsNotPresent(type: string): NightwatchBrowser
     getLastTransactionHash(callback: (hash: string) => void)
diff --git a/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol b/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol
index 73ecf078be..b3c11e796e 100644
--- a/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol
+++ b/apps/remix-ide/contracts/node_modules/openzeppelin-solidity/contracts/sample.sol
@@ -1 +1 @@
-import "https://github.com/OpenZeppelin/openzeppelin-contracts/contracts/token/ERC20/ERC20.sol"; contract test11 {}
+import "https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol"; contract test11 {}
diff --git a/apps/remix-ide/release-process.md b/apps/remix-ide/release-process.md
index 1d9c89a7fa..76d6cb74b4 100644
--- a/apps/remix-ide/release-process.md
+++ b/apps/remix-ide/release-process.md
@@ -1,9 +1,9 @@
-This document includes:
+This document describes:
  - how to update remix.ethereum.org.
  - how to update remix-alpha.ethereum.org.
  - how to release remix IDE.
 
-# remix IDE release
+# Remix IDE Release
 
  - git fetch origin master
  - git checkout origin/master
@@ -12,7 +12,7 @@ This document includes:
  - merge PR
  - git fetch origin master
  - git checkout origin/master
- - git tag v(version-number)
+ - git tag v<version-number>
  - git push --tags
  - github-changes -o ethereum -r remix-ide -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
  - publish a release in github using the changelog
@@ -23,7 +23,7 @@ This document includes:
  - npm publish
  - after remix_live is updated, drop the zip (from https://github.com/ethereum/remix-live/) to the release.
 
-# remix-ide beta release
+# Remix IDE Beta Release
  - git fetch origin master
  - git checkout origin/master
  - git checkout -b bumpVersion
@@ -31,7 +31,7 @@ This document includes:
  - merge PR
  - git fetch origin master
  - git checkout origin/master
- - git tag v(version-number) (with "vx.x.x-beta.1")
+ - git tag v<version-number> (with "vx.x.x-beta.1")
  - git push --tags
  - github-changes -o ethereum -r remix-ide -a --only-pulls --use-commit-body --only-merges --between-tags previous_version...next_version
  - publish a beta release in github using the changelog
@@ -41,7 +41,7 @@ This document includes:
 
 This is not strictly speaking a release. Updating the remix site is done through the Travis build:
 
- - git co -b remix_live origin/remix_live
+ - git checkout -b remix_live origin/remix_live
  - git reset --hard -master-commit-hash-
  - git push -f origin remix_live
 
diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.ts
similarity index 88%
rename from apps/remix-ide/src/app.js
rename to apps/remix-ide/src/app.ts
index ab3b9ff246..86eb8697a2 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.ts
@@ -26,21 +26,21 @@ import { WalkthroughService } from './walkthroughService'
 
 import { OffsetToLineColumnConverter, CompilerMetadata, CompilerArtefacts, FetchAndCompile, CompilerImports, GistHandler } from '@remix-project/core-plugin'
 
-import {Registry} from '@remix-project/remix-lib'
-import {ConfigPlugin} from './app/plugins/config'
-import {StoragePlugin} from './app/plugins/storage'
-import {Layout} from './app/panels/layout'
-import {NotificationPlugin} from './app/plugins/notification'
-import {Blockchain} from './blockchain/blockchain'
-import {MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider, CancunVMProvider} from './app/providers/vm-provider'
-import {MainnetForkVMProvider} from './app/providers/mainnet-vm-fork-provider'
-import {SepoliaForkVMProvider} from './app/providers/sepolia-vm-fork-provider'
-import {GoerliForkVMProvider} from './app/providers/goerli-vm-fork-provider'
-import {CustomForkVMProvider} from './app/providers/custom-vm-fork-provider'
-import {HardhatProvider} from './app/providers/hardhat-provider'
-import {GanacheProvider} from './app/providers/ganache-provider'
-import {FoundryProvider} from './app/providers/foundry-provider'
-import {ExternalHttpProvider} from './app/providers/external-http-provider'
+import { Registry } from '@remix-project/remix-lib'
+import { ConfigPlugin } from './app/plugins/config'
+import { StoragePlugin } from './app/plugins/storage'
+import { Layout } from './app/panels/layout'
+import { NotificationPlugin } from './app/plugins/notification'
+import { Blockchain } from './blockchain/blockchain'
+import { MergeVMProvider, LondonVMProvider, BerlinVMProvider, ShanghaiVMProvider, CancunVMProvider } from './app/providers/vm-provider'
+import { MainnetForkVMProvider } from './app/providers/mainnet-vm-fork-provider'
+import { SepoliaForkVMProvider } from './app/providers/sepolia-vm-fork-provider'
+import { GoerliForkVMProvider } from './app/providers/goerli-vm-fork-provider'
+import { CustomForkVMProvider } from './app/providers/custom-vm-fork-provider'
+import { HardhatProvider } from './app/providers/hardhat-provider'
+import { GanacheProvider } from './app/providers/ganache-provider'
+import { FoundryProvider } from './app/providers/foundry-provider'
+import { ExternalHttpProvider } from './app/providers/external-http-provider'
 import { EnvironmentExplorer } from './app/providers/environment-explorer'
 import { FileDecorator } from './app/plugins/file-decorator'
 import { CodeFormat } from './app/plugins/code-format'
@@ -58,7 +58,7 @@ import { xtermPlugin } from './app/plugins/electron/xtermPlugin'
 import { ripgrepPlugin } from './app/plugins/electron/ripgrepPlugin'
 import { compilerLoaderPlugin, compilerLoaderPluginDesktop } from './app/plugins/electron/compilerLoaderPlugin'
 import { appUpdaterPlugin } from './app/plugins/electron/appUpdaterPlugin'
-import { remixAIDesktopPlugin } from './app/plugins/electron/remixAIDesktopPlugin' 
+import { remixAIDesktopPlugin } from './app/plugins/electron/remixAIDesktopPlugin'
 import { RemixAIPlugin } from './app/plugins/remixAIPlugin'
 import { SlitherHandleDesktop } from './app/plugins/electron/slitherPlugin'
 import { SlitherHandle } from './app/files/slither-handle'
@@ -72,9 +72,9 @@ import { Matomo } from './app/plugins/matomo'
 
 import { TemplatesSelectionPlugin } from './app/plugins/templates-selection/templates-selection-plugin'
 
-const isElectron = require('is-electron')
+import isElectron from 'is-electron'
 
-const remixLib = require('@remix-project/remix-lib')
+import * as remixLib from '@remix-project/remix-lib'
 
 import { QueryParams } from '@remix-project/remix-lib'
 import { SearchPlugin } from './app/tabs/search'
@@ -82,27 +82,27 @@ import { ScriptRunnerUIPlugin } from './app/tabs/script-runner-ui'
 import { ElectronProvider } from './app/files/electronProvider'
 
 const Storage = remixLib.Storage
-const RemixDProvider = require('./app/files/remixDProvider')
-const Config = require('./config')
+import RemixDProvider from './app/files/remixDProvider'
+import Config from './config'
 
-const FileManager = require('./app/files/fileManager')
+import FileManager from './app/files/fileManager'
 import FileProvider from "./app/files/fileProvider"
 import { appPlatformTypes } from '@remix-ui/app'
 
-const DGitProvider = require('./app/files/dgitProvider')
-const WorkspaceFileProvider = require('./app/files/workspaceFileProvider')
+import DGitProvider from './app/files/dgitProvider'
+import WorkspaceFileProvider from './app/files/workspaceFileProvider'
 
-const PluginManagerComponent = require('./app/components/plugin-manager-component')
+import PluginManagerComponent from './app/components/plugin-manager-component'
 
-const CompileTab = require('./app/tabs/compile-tab')
-const SettingsTab = require('./app/tabs/settings-tab')
-const AnalysisTab = require('./app/tabs/analysis-tab')
-const { DebuggerTab } = require('./app/tabs/debugger-tab')
-const TestTab = require('./app/tabs/test-tab')
-const FilePanel = require('./app/panels/file-panel')
-const Editor = require('./app/editor/editor')
-const Terminal = require('./app/panels/terminal')
-const { TabProxy } = require('./app/panels/tab-proxy.js')
+import CompileTab from './app/tabs/compile-tab'
+import SettingsTab from './app/tabs/settings-tab'
+import AnalysisTab from './app/tabs/analysis-tab'
+import DebuggerTab from './app/tabs/debugger-tab'
+import TestTab from './app/tabs/test-tab'
+import Filepanel from './app/panels/file-panel'
+import Editor from './app/editor/editor'
+import Terminal from './app/panels/terminal'
+import TabProxy from './app/panels/tab-proxy.js'
 
 const _paq = (window._paq = window._paq || [])
 
@@ -115,16 +115,49 @@ export class platformApi {
   }
 }
 
+type Components = {
+  filesProviders: {
+    browser?: any
+    localhost?: any
+    workspace?: any
+    electron?: any
+  }
+}
+
 class AppComponent {
+  appManager: RemixAppManager
+  queryParams: QueryParams
+  private _components: Components
+  panels: any
+  workspace: any
+  engine: RemixEngine
+  matomoConfAlreadySet: any
+  matomoCurrentSetting: any
+  showMatomo: boolean
+  walkthroughService: WalkthroughService
+  platform: 'desktop' | 'web'
+  gistHandler: GistHandler
+  themeModule: ThemeModule
+  localeModule: LocaleModule
+  notification: NotificationPlugin
+  layout: Layout
+  mainview: any
+  menuicons: VerticalIcons
+  sidePanel: SidePanel
+  hiddenPanel: HiddenPanel
+  pinnedPanel: PinnedPanel
+  popupPanel: PopupPanel
+  statusBar: StatusBar
+  settings: SettingsTab
   constructor() {
     const PlatFormAPi = new platformApi()
     Registry.getInstance().put({
       api: PlatFormAPi,
       name: 'platform'
     })
-    this.appManager = new RemixAppManager({})
+    this.appManager = new RemixAppManager()
     this.queryParams = new QueryParams()
-    this._components = {}
+    this._components = {} as Components
     // setup storage
     const configStorage = new Storage('config-v0.8:')
 
@@ -161,7 +194,6 @@ class AppComponent {
       name: 'fileproviders'
     })
 
-
   }
 
   async run() {
@@ -184,7 +216,7 @@ class AppComponent {
     this.matomoConfAlreadySet = Registry.getInstance().get('config').api.exists('settings/matomo-analytics')
     this.matomoCurrentSetting = Registry.getInstance().get('config').api.get('settings/matomo-analytics')
 
-    let electronTracking = window.electronAPI ? await window.electronAPI.canTrackMatomo() : false
+    const electronTracking = (window as any).electronAPI ? await (window as any).electronAPI.canTrackMatomo() : false
 
     const lastMatomoCheck = window.localStorage.getItem('matomo-analytics-consent')
     const sixMonthsAgo = new Date();
@@ -193,11 +225,11 @@ class AppComponent {
     const e2eforceMatomoToShow = window.localStorage.getItem('showMatomo') && window.localStorage.getItem('showMatomo') === 'true'
     const contextShouldShowMatomo = matomoDomains[window.location.hostname] || e2eforceMatomoToShow || electronTracking
     const shouldRenewConsent = this.matomoCurrentSetting === false && (!lastMatomoCheck || new Date(Number(lastMatomoCheck)) < sixMonthsAgo) // it is set to false for more than 6 months.
-    this.showMatomo = contextShouldShowMatomo && (!this.matomoConfAlreadySet || shouldRenewConsent)        
+    this.showMatomo = contextShouldShowMatomo && (!this.matomoConfAlreadySet || shouldRenewConsent)
 
     if (this.showMatomo && shouldRenewConsent) {
       _paq.push(['trackEvent', 'Matomo', 'refreshMatomoPermissions']);
-    }    
+    }
 
     this.walkthroughService = new WalkthroughService(appManager)
 
@@ -387,7 +419,7 @@ class AppComponent {
       ganacheProvider,
       foundryProvider,
       externalHttpProvider,
-      environmentExplorer,  
+      environmentExplorer,
       this.walkthroughService,
       search,
       solidityumlgen,
@@ -456,10 +488,10 @@ class AppComponent {
     this.popupPanel = new PopupPanel()
 
     const pluginManagerComponent = new PluginManagerComponent(appManager, this.engine)
-    const filePanel = new FilePanel(appManager, contentImport)
+    const filePanel = new Filepanel(appManager, contentImport)
     this.statusBar = new StatusBar(filePanel, this.menuicons)
     const landingPage = new LandingPage(appManager, this.menuicons, fileManager, filePanel, contentImport)
-    this.settings = new SettingsTab(Registry.getInstance().get('config').api, editor, appManager)
+    this.settings = new SettingsTab(Registry.getInstance().get('config').api, editor)//, appManager)
 
     this.engine.register([this.menuicons, landingPage, this.hiddenPanel, this.sidePanel, this.statusBar, filePanel, pluginManagerComponent, this.settings, this.pinnedPanel, this.popupPanel])
 
@@ -514,7 +546,7 @@ class AppComponent {
 
   async activate() {
     const queryParams = new QueryParams()
-    const params = queryParams.get()
+    const params: any = queryParams.get()
 
     try {
       this.engine.register(await this.appManager.registeredPlugins())
@@ -610,10 +642,11 @@ class AppComponent {
             }
 
             if (params.call) {
-              const callDetails = params.call.split('//')
+              const callDetails: any = params.call.split('//')
               if (callDetails.length > 1) {
                 this.appManager.call('notification', 'toast', `initiating ${callDetails[0]} and calling "${callDetails[1]}" ...`)
                 // @todo(remove the timeout when activatePlugin is on 0.3.0)
+                //@ts-ignore
                 await this.appManager.call(...callDetails).catch(console.error)
               }
             }
@@ -629,6 +662,7 @@ class AppComponent {
 
                   // @todo(remove the timeout when activatePlugin is on 0.3.0)
                   try {
+                    //@ts-ignore
                     await this.appManager.call(...callDetails)
                   } catch (e) {
                     console.error(e)
diff --git a/apps/remix-ide/src/app/components/main-panel.tsx b/apps/remix-ide/src/app/components/main-panel.tsx
index e48399e839..a7f8a6a422 100644
--- a/apps/remix-ide/src/app/components/main-panel.tsx
+++ b/apps/remix-ide/src/app/components/main-panel.tsx
@@ -15,7 +15,7 @@ const profile = {
 export class MainPanel extends AbstractPanel {
   element: HTMLDivElement
   dispatch: React.Dispatch<any> = () => {}
-  constructor(config) {
+  constructor(config = null) {
     super(profile)
     this.element = document.createElement('div')
     this.element.setAttribute('data-id', 'mainPanelPluginsContainer')
diff --git a/apps/remix-ide/src/app/components/plugin-manager-component.js b/apps/remix-ide/src/app/components/plugin-manager-component.js
index 816d9c1c11..e4471bbed2 100644
--- a/apps/remix-ide/src/app/components/plugin-manager-component.js
+++ b/apps/remix-ide/src/app/components/plugin-manager-component.js
@@ -19,7 +19,7 @@ const profile = {
   maintainedBy: "Remix"
 }
 
-class PluginManagerComponent extends ViewPlugin {
+export default class PluginManagerComponent extends ViewPlugin {
   constructor (appManager, engine) {
     super(profile)
     this.appManager = appManager
diff --git a/apps/remix-ide/src/app/components/popup-panel.tsx b/apps/remix-ide/src/app/components/popup-panel.tsx
index b000fde79d..1728dbfbba 100644
--- a/apps/remix-ide/src/app/components/popup-panel.tsx
+++ b/apps/remix-ide/src/app/components/popup-panel.tsx
@@ -24,7 +24,7 @@ export class PopupPanel extends AbstractPanel {
   dispatch: React.Dispatch<any> = () => { }
   appStateDispatch: React.Dispatch<AppAction> = () => { }
 
-  constructor(config) {
+  constructor(config = null) {
     super(profile)
     this.event = new EventEmitter()
   }
diff --git a/apps/remix-ide/src/app/editor/editor.js b/apps/remix-ide/src/app/editor/editor.js
index 8072258c77..04259079aa 100644
--- a/apps/remix-ide/src/app/editor/editor.js
+++ b/apps/remix-ide/src/app/editor/editor.js
@@ -5,7 +5,6 @@ import { EditorUI } from '@remix-ui/editor' // eslint-disable-line
 import { Plugin } from '@remixproject/engine'
 import * as packageJson from '../../../../../package.json'
 import { PluginViewWrapper } from '@remix-ui/helper'
-import { commitChange } from '@remix-ui/git'
 
 const EventManager = require('../../lib/events')
 
@@ -17,7 +16,7 @@ const profile = {
   methods: ['highlight', 'discardHighlight', 'clearAnnotations', 'addLineText', 'discardLineTexts', 'addAnnotation', 'gotoLine', 'revealRange', 'getCursorPosition', 'open', 'addModel','addErrorMarker', 'clearErrorMarkers', 'getText', 'getPositionAt', 'openReadOnly'],
 }
 
-class Editor extends Plugin {
+export default class Editor extends Plugin {
   constructor () {
     super(profile)
 
@@ -91,7 +90,7 @@ class Editor extends Plugin {
   }
 
   render () {
-    return <div ref={(element)=>{ 
+    return <div ref={(element)=>{
       this.ref = element
       this.ref.currentContent = () => this.currentContent() // used by e2e test
       this.ref.setCurrentContent = (value) => {
@@ -103,7 +102,7 @@ class Editor extends Plugin {
       this.ref.gotoLine = (line, column) => this.gotoLine(line, column || 0)
       this.ref.getCursorPosition = () => this.getCursorPosition()
       this.ref.addDecoration = (marker, filePath, typeOfDecoration) => this.addDecoration(marker, filePath, typeOfDecoration)
-      this.ref.clearDecorationsByPlugin = (filePath, plugin, typeOfDecoration) => this.clearDecorationsByPlugin(filePath, plugin, typeOfDecoration)      
+      this.ref.clearDecorationsByPlugin = (filePath, plugin, typeOfDecoration) => this.clearDecorationsByPlugin(filePath, plugin, typeOfDecoration)
       this.ref.keepDecorationsFor = (name, typeOfDecoration) => this.keepDecorationsFor(name, typeOfDecoration)
     }} id='editorView'>
       <PluginViewWrapper plugin={this} />
@@ -250,7 +249,7 @@ class Editor extends Plugin {
    */
   async _createSession (path, content, mode, readOnly) {
     if (!this.activated) return
-    
+
     this.emit('addModel', content, mode, path, readOnly || this.readOnlySessions[path])
     return {
       path,
@@ -549,7 +548,7 @@ class Editor extends Plugin {
     decoration.from = from
 
     const { currentDecorations, registeredDecorations } = this.api.addDecoration(decoration, path, typeOfDecoration)
-    if (!this.registeredDecorations[typeOfDecoration][filePath]) this.registeredDecorations[typeOfDecoration][filePath] = []    
+    if (!this.registeredDecorations[typeOfDecoration][filePath]) this.registeredDecorations[typeOfDecoration][filePath] = []
     this.registeredDecorations[typeOfDecoration][filePath].push(...registeredDecorations)
     if (!this.currentDecorations[typeOfDecoration][filePath]) this.currentDecorations[typeOfDecoration][filePath] = []
     this.currentDecorations[typeOfDecoration][filePath].push(...currentDecorations)
@@ -602,5 +601,3 @@ class Editor extends Plugin {
     return this.api.getPositionAt(offset)
   }
 }
-
-module.exports = Editor
diff --git a/apps/remix-ide/src/app/files/dgitProvider.ts b/apps/remix-ide/src/app/files/dgitProvider.ts
index cdb863b4b7..4a8778c0ef 100644
--- a/apps/remix-ide/src/app/files/dgitProvider.ts
+++ b/apps/remix-ide/src/app/files/dgitProvider.ts
@@ -28,7 +28,7 @@ const profile: LibraryProfile = {
     , 'getGitHubUser', 'remotebranches', 'remotecommits', 'repositories', 'getCommitChanges', 'compareBranches'],
   kind: 'file-system'
 }
-class DGitProvider extends Plugin<any, CustomRemixApi> {
+export default class DGitProvider extends Plugin<any, CustomRemixApi> {
   constructor() {
     super(profile)
   }
diff --git a/apps/remix-ide/src/app/files/fileManager.ts b/apps/remix-ide/src/app/files/fileManager.ts
index a821ced648..5b3e70ae4a 100644
--- a/apps/remix-ide/src/app/files/fileManager.ts
+++ b/apps/remix-ide/src/app/files/fileManager.ts
@@ -26,7 +26,7 @@ const profile = {
     'readFile', 'copyFile', 'copyDir', 'rename', 'mkdir', 'readdir', 'dirList', 'fileList', 'remove', 'getCurrentFile', 'getFile',
     'getFolder', 'setFile', 'switchFile', 'refresh', 'getProviderOf', 'getProviderByName', 'getPathFromUrl', 'getUrlFromPath',
     'saveCurrentFile', 'setBatchFiles', 'isGitRepo', 'isFile', 'isDirectory', 'hasGitSubmodule', 'copyFolderToJson', 'diff',
-    'hasGitSubmodules'
+    'hasGitSubmodules', 'getOpenedFiles'
   ],
   kind: 'file-system'
 }
@@ -40,7 +40,7 @@ const errorMsg = {
 const createError = (err) => {
   return new Error(`${errorMsg[err.code]} ${err.message || ''}`)
 }
-class FileManager extends Plugin {
+export default class FileManager extends Plugin {
   mode: string
   openedFiles: any
   editor: any
diff --git a/apps/remix-ide/src/app/files/remixDProvider.js b/apps/remix-ide/src/app/files/remixDProvider.js
index 62171fdc5b..f13ccbaa0c 100644
--- a/apps/remix-ide/src/app/files/remixDProvider.js
+++ b/apps/remix-ide/src/app/files/remixDProvider.js
@@ -1,7 +1,7 @@
 'use strict'
 import FileProvider from "./fileProvider"
 
-module.exports = class RemixDProvider extends FileProvider {
+export default class RemixDProvider extends FileProvider {
   constructor (appManager) {
     super('localhost')
     this._appManager = appManager
diff --git a/apps/remix-ide/src/app/files/workspaceFileProvider.js b/apps/remix-ide/src/app/files/workspaceFileProvider.js
index 900ad8ccba..c7e33862c4 100644
--- a/apps/remix-ide/src/app/files/workspaceFileProvider.js
+++ b/apps/remix-ide/src/app/files/workspaceFileProvider.js
@@ -3,7 +3,7 @@
 const EventManager = require('events')
 import FileProvider from "./fileProvider"
 
-class WorkspaceFileProvider extends FileProvider {
+export default class WorkspaceFileProvider extends FileProvider {
   constructor () {
     super('')
     this.workspacesPath = '.workspaces'
@@ -18,10 +18,10 @@ class WorkspaceFileProvider extends FileProvider {
         })
       }).catch((e) => {
         console.log(e)
-      })     
+      })
     } catch (e) {
       // we don't need to log error if this throws an error
-    }    
+    }
   }
 
   setWorkspace (workspace) {
diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index 2b3946bca1..6277bffcc9 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -55,7 +55,7 @@ const profile = {
   version: packageJson.version,
   maintainedBy: 'Remix'
 }
-module.exports = class Filepanel extends ViewPlugin {
+export default class Filepanel extends ViewPlugin {
   constructor(appManager, contentImport) {
     super(profile)
     this.registry = Registry.getInstance()
diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts
index 539a9b1c48..2ed6541d9e 100644
--- a/apps/remix-ide/src/app/panels/layout.ts
+++ b/apps/remix-ide/src/app/panels/layout.ts
@@ -12,7 +12,7 @@ const profile: Profile = {
 interface panelState {
   active: boolean
   plugin: Plugin
-  minimized: boolean
+  minimized?: boolean
 }
 interface panels {
   tabs: panelState
diff --git a/apps/remix-ide/src/app/panels/tab-proxy.js b/apps/remix-ide/src/app/panels/tab-proxy.js
index d71bd3ec6a..8c90ca8b8e 100644
--- a/apps/remix-ide/src/app/panels/tab-proxy.js
+++ b/apps/remix-ide/src/app/panels/tab-proxy.js
@@ -10,7 +10,7 @@ const profile = {
   kind: 'other'
 }
 
-export class TabProxy extends Plugin {
+export default class TabProxy extends Plugin {
   constructor (fileManager, editor) {
     super(profile)
     this.event = new EventEmitter()
diff --git a/apps/remix-ide/src/app/panels/terminal.tsx b/apps/remix-ide/src/app/panels/terminal.tsx
index a30cf085bd..3623a592cb 100644
--- a/apps/remix-ide/src/app/panels/terminal.tsx
+++ b/apps/remix-ide/src/app/panels/terminal.tsx
@@ -24,7 +24,7 @@ const profile = {
   version: packageJson.version
 }
 
-class Terminal extends Plugin {
+export default class Terminal extends Plugin {
   fileImport: CompilerImports
   event: any
   globalRegistry: Registry
@@ -163,4 +163,3 @@ class Terminal extends Plugin {
   }
 }
 
-module.exports = Terminal
diff --git a/apps/remix-ide/src/app/plugins/git.tsx b/apps/remix-ide/src/app/plugins/git.tsx
index b3fe6738d0..42c655c7cf 100644
--- a/apps/remix-ide/src/app/plugins/git.tsx
+++ b/apps/remix-ide/src/app/plugins/git.tsx
@@ -7,13 +7,12 @@ import * as packageJson from '../../../../../package.json'
 const profile = {
   name: 'dgit',
   displayName: 'Git',
-  desciption: 'Git plugin for Remix',
+  description: 'Git plugin for Remix',
   methods: ['open', 'init'],
   events: [''],
   version: packageJson.version,
   maintainedBy: 'Remix',
   permission: true,
-  description: 'Use this plugin to interact with your git repositories',
   location: 'sidePanel',
   icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZD0iTTIxLjAwNyA4LjIyMTY4QzIxLjAxMDUgNy41Mjc5MiAyMC44MjA3IDYuODQ2ODkgMjAuNDU5MSA2LjI1NDg1QzIwLjA5NzQgNS42NjI4MSAxOS41NzggNS4xODMxNSAxOC45NTkyIDQuODY5NTdDMTguMzQwMyA0LjU1NiAxNy42NDYzIDQuNDIwOTEgMTYuOTU1MSA0LjQ3OTQxQzE2LjI2MzcgNC41Mzc5MyAxNS42MDI1IDQuNzg3NzMgMTUuMDQ1IDUuMjAwODVDMTQuNDg3NyA1LjYxMzk3IDE0LjA1NjMgNi4xNzQwOSAxMy43OTkzIDYuODE4NUMxMy41NDI0IDcuNDYyOSAxMy40Njk3IDguMTY2MTMgMTMuNTg5OCA4Ljg0OTQ0QzEzLjcwOTkgOS41MzI3NCAxNC4wMTc3IDEwLjE2OTIgMTQuNDc4OSAxMC42ODc0QzE0Ljk0MDIgMTEuMjA1NiAxNS41MzY3IDExLjU4NTIgMTYuMjAxNSAxMS43ODM2QzE1Ljk1NiAxMi4yODI0IDE1LjU3NjMgMTIuNzAzIDE1LjEwNDkgMTIuOTk3OUMxNC42MzM2IDEzLjI5MjkgMTQuMDg5NCAxMy40NTA1IDEzLjUzMzQgMTMuNDUzMkgxMC41NDRDOS40MzcyNiAxMy40NTcxIDguMzcxNjMgMTMuODcyNyA3LjU1NDUxIDE0LjYxOTFWNy4zOTgwOUM4LjQ2MTg0IDcuMjEyODggOS4yNjgwOCA2LjY5NzM3IDkuODE2OTIgNS45NTE1MUMxMC4zNjU4IDUuMjA1NjUgMTAuNjE4MSA0LjI4MjU2IDEwLjUyNSAzLjM2MTIxQzEwLjQzMTkgMi40Mzk4NyAxMC4wMDAxIDEuNTg1OSA5LjMxMzE2IDAuOTY0ODczQzguNjI2MjQgMC4zNDM4NDUgNy43MzMxOSAwIDYuODA3MTYgMEM1Ljg4MTEyIDAgNC45ODgwNyAwLjM0Mzg0NSA0LjMwMTE0IDAuOTY0ODczQzMuNjE0MjIgMS41ODU5IDMuMTgyMzYgMi40Mzk4NyAzLjA4OTI4IDMuMzYxMjFDMi45OTYyIDQuMjgyNTYgMy4yNDg1NSA1LjIwNTY1IDMuNzk3MzkgNS45NTE1MUM0LjM0NjIzIDYuNjk3MzcgNS4xNTI0NyA3LjIxMjg4IDYuMDU5OCA3LjM5ODA5VjE2LjUxNTlDNS4xNTQxOCAxNi42ODkxIDQuMzQzMjMgMTcuMTg3NyAzLjc3OTkzIDE3LjkxNzZDMy4yMTY2MyAxOC42NDc2IDIuOTM5OTIgMTkuNTU4NSAzLjAwMTk3IDIwLjQ3ODVDMy4wNjQwMyAyMS4zOTg0IDMuNDYwNTcgMjIuMjYzOSA0LjExNjggMjIuOTExNUM0Ljc3MzAzIDIzLjU1OTIgNS42NDM2IDIzLjk0NDQgNi41NjQyNyAyMy45OTQ0QzcuNDg0OTYgMjQuMDQ0NSA4LjM5MjExIDIzLjc1NTggOS4xMTQ2NCAyMy4xODNDOS44MzcxOCAyMi42MTAyIDEwLjMyNTEgMjEuNzkyOCAxMC40ODY1IDIwLjg4NUMxMC42NDc4IDE5Ljk3NzEgMTAuNDcxNCAxOS4wNDE3IDkuOTkwNDggMTguMjU1QzkuNTA5NTcgMTcuNDY4MyA4Ljc1NzQxIDE2Ljg4NDggNy44NzU4OCAxNi42MTQ1QzguMTIxNzYgMTYuMTE2MiA4LjUwMTY3IDE1LjY5NjMgOC45NzI5NiAxNS40MDE5QzkuNDQ0MjYgMTUuMTA3NCA5Ljk4ODI3IDE0Ljk1MDMgMTAuNTQ0IDE0Ljk0NzlIMTMuNTMzNEMxNC40NjYxIDE0Ljk0MzYgMTUuMzc0MiAxNC42NDg2IDE2LjEzMTMgMTQuMTAzOUMxNi44ODg0IDEzLjU1OTIgMTcuNDU2OCAxMi43OTIgMTcuNzU3NSAxMS45MDkxQzE4LjY1MzQgMTEuNzkxNCAxOS40NzYzIDExLjM1MjggMjAuMDczOCAxMC42NzQ4QzIwLjY3MTMgOS45OTY4IDIxLjAwMjggOS4xMjUzMyAyMS4wMDcgOC4yMjE2OFpNNC41NjUwOCAzLjczNzUyQzQuNTY1MDggMy4yOTQwOCA0LjY5NjU3IDIuODYwNiA0Ljk0MjkzIDIuNDkxOUM1LjE4OTMgMi4xMjMxOSA1LjUzOTQ3IDEuODM1ODEgNS45NDkxNSAxLjY2NjExQzYuMzU4ODQgMS40OTY0MiA2LjgwOTY1IDEuNDUyMDIgNy4yNDQ1NiAxLjUzODU0QzcuNjc5NDggMS42MjUwNCA4LjA3ODk4IDEuODM4NTcgOC4zOTI1NCAyLjE1MjE0QzguNzA2MTEgMi40NjU3IDguOTE5NjQgMi44NjUyIDkuMDA2MTUgMy4zMDAxMkM5LjA5MjY2IDMuNzM1MDQgOS4wNDgyNyA0LjE4NTg1IDguODc4NTcgNC41OTU1M0M4LjcwODg3IDUuMDA1MjEgOC40MjE0OSA1LjM1NTM5IDguMDUyNzggNS42MDE3NUM3LjY4NDA4IDUuODQ4MTEgNy4yNTA2IDUuOTc5NiA2LjgwNzE2IDUuOTc5NkM2LjIxMjUyIDUuOTc5NiA1LjY0MjI0IDUuNzQzMzkgNS4yMjE3NyA1LjMyMjkxQzQuODAxMjkgNC45MDI0NSA0LjU2NTA4IDQuMzMyMTYgNC41NjUwOCAzLjczNzUyWk05LjA0OTIzIDIwLjE3OTRDOS4wNDkyMyAyMC42MjI5IDguOTE3NzQgMjEuMDU2MyA4LjY3MTM4IDIxLjQyNUM4LjQyNTAxIDIxLjc5MzcgOC4wNzQ4NSAyMi4wODExIDcuNjY1MTYgMjIuMjUwOEM3LjI1NTQ3IDIyLjQyMDUgNi44MDQ2NiAyMi40NjQ5IDYuMzY5NzUgMjIuMzc4NEM1LjkzNDgzIDIyLjI5MiA1LjUzNTMzIDIyLjA3ODQgNS4yMjE3NyAyMS43NjQ4QzQuOTA4MjEgMjEuNDUxMiA0LjY5NDY3IDIxLjA1MTcgNC42MDgxNiAyMC42MTY5QzQuNTIxNjUgMjAuMTgxOSA0LjU2NjA1IDE5LjczMTEgNC43MzU3NSAxOS4zMjE0QzQuOTA1NDUgMTguOTExNyA1LjE5MjgyIDE4LjU2MTUgNS41NjE1MyAxOC4zMTUyQzUuOTMwMjMgMTguMDY4OSA2LjM2MzcxIDE3LjkzNzMgNi44MDcxNiAxNy45MzczQzcuNDAxNzkgMTcuOTM3MyA3Ljk3MjA3IDE4LjE3MzYgOC4zOTI1NCAxOC41OTRDOC44MTMwMiAxOS4wMTQ1IDkuMDQ5MjMgMTkuNTg0OCA5LjA0OTIzIDIwLjE3OTRaTTE3LjI3MDIgMTAuNDYzOEMxNi44MjY3IDEwLjQ2MzggMTYuMzkzMyAxMC4zMzIyIDE2LjAyNDYgMTAuMDg1OUMxNS42NTU5IDkuODM5NTQgMTUuMzY4NSA5LjQ4OTM3IDE1LjE5ODggOS4wNzk2OUMxNS4wMjkxIDguNjcgMTQuOTg0NyA4LjIxOTIgMTUuMDcxMiA3Ljc4NDI3QzE1LjE1NzYgNy4zNDkzNSAxNS4zNzEyIDYuOTQ5ODUgMTUuNjg0OCA2LjYzNjI5QzE1Ljk5ODQgNi4zMjI3MyAxNi4zOTc5IDYuMTA5MTkgMTYuODMyNyA2LjAyMjY4QzE3LjI2NzcgNS45MzYxNyAxNy43MTg1IDUuOTgwNTggMTguMTI4MSA2LjE1MDI3QzE4LjUzNzkgNi4zMTk5NyAxOC44ODgxIDYuNjA3MzQgMTkuMTM0NCA2Ljk3NjA1QzE5LjM4MDcgNy4zNDQ3NiAxOS41MTIzIDcuNzc4MjMgMTkuNTEyMyA4LjIyMTY4QzE5LjUxMjMgOC44MTYzMiAxOS4yNzYgOS4zODY2IDE4Ljg1NTYgOS44MDcwNkMxOC40MzUxIDEwLjIyNzUgMTcuODY0OCAxMC40NjM4IDE3LjI3MDIgMTAuNDYzOFoiIGZpbGw9IiM0MjQyNDIiLz4KPC9zdmc+Cg=="
 }
diff --git a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
index 1dde824c8a..0159b7d938 100644
--- a/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
+++ b/apps/remix-ide/src/app/plugins/remixAIPlugin.tsx
@@ -3,9 +3,10 @@ import { ViewPlugin } from '@remixproject/engine-web'
 import { Plugin } from '@remixproject/engine';
 import { RemixAITab, ChatApi } from '@remix-ui/remix-ai'
 import React, { useCallback } from 'react';
-import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, CodeExplainAgent } from '@remix/remix-ai-core';
+import { ICompletions, IModel, RemoteInferencer, IRemoteModel, IParams, GenerationParams, CodeExplainAgent, SecurityAgent } from '@remix/remix-ai-core';
 import { CustomRemixApi } from '@remix-api'
 import { PluginViewWrapper } from '@remix-ui/helper'
+const _paq = (window._paq = window._paq || [])
 
 type chatRequestBufferT<T> = {
   [key in keyof T]: T[key]
@@ -16,9 +17,8 @@ const profile = {
   displayName: 'RemixAI',
   methods: ['code_generation', 'code_completion',
     "solidity_answer", "code_explaining",
-    "code_insertion", "error_explaining",
-    "initialize", 'chatPipe', 'ProcessChatRequestBuffer',
-    'isChatRequestPending'],
+    "code_insertion", "error_explaining", "vulnerability_check",
+    "initialize", 'chatPipe', 'ProcessChatRequestBuffer', 'isChatRequestPending'],
   events: [],
   icon: 'assets/img/remix-logo-blue.png',
   description: 'RemixAI provides AI services to Remix IDE.',
@@ -37,15 +37,16 @@ export class RemixAIPlugin extends ViewPlugin {
   remoteInferencer:RemoteInferencer = null
   isInferencing: boolean = false
   chatRequestBuffer: chatRequestBufferT<any> = null
-  agent: CodeExplainAgent
+  codeExpAgent: CodeExplainAgent
+  securityAgent: SecurityAgent
   useRemoteInferencer:boolean = false
   dispatch: any
 
   constructor(inDesktop:boolean) {
     super(profile)
     this.isOnDesktop = inDesktop
-    this.agent = new CodeExplainAgent(this)
-    // user machine dont use resource for remote inferencing
+    this.codeExpAgent = new CodeExplainAgent(this)
+    // user machine dont use ressource for remote inferencing
   }
 
   onActivation(): void {
@@ -61,6 +62,8 @@ export class RemixAIPlugin extends ViewPlugin {
       this.useRemoteInferencer = true
       this.initialize()
     }
+
+    this.securityAgent = new SecurityAgent(this)
   }
 
   async initialize(model1?:IModel, model2?:IModel, remoteModel?:IRemoteModel, useRemote?:boolean){
@@ -96,11 +99,6 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   async code_generation(prompt: string): Promise<any> {
-    if (this.isInferencing) {
-      this.call('terminal', 'log', { type: 'aitypewriterwarning', value: "RemixAI is already busy!" })
-      return
-    }
-
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       return await this.call(this.remixDesktopPluginName, 'code_generation', prompt)
     } else {
@@ -117,17 +115,8 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   async solidity_answer(prompt: string, params: IParams=GenerationParams): Promise<any> {
-    if (this.isInferencing) {
-      this.call('terminal', 'log', { type: 'aitypewriterwarning', value: "RemixAI is already busy!" })
-      return
-    }
-    if (prompt.trimStart().startsWith('gpt') || prompt.trimStart().startsWith('sol-gpt')) {
-      params.terminal_output = true
-      params.stream_result = false
-      params.return_stream_response = false
-    }
+    const newPrompt = await this.codeExpAgent.chatCommand(prompt)
 
-    const newPrompt = await this.agent.chatCommand(prompt)
     let result
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       result = await this.call(this.remixDesktopPluginName, 'solidity_answer', newPrompt)
@@ -141,11 +130,6 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   async code_explaining(prompt: string, context: string, params: IParams=GenerationParams): Promise<any> {
-    if (this.isInferencing) {
-      this.call('terminal', 'log', { type: 'aitypewriterwarning', value: "RemixAI is already busy!" })
-      return
-    }
-
     let result
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       result = await this.call(this.remixDesktopPluginName, 'code_explaining', prompt, context, params)
@@ -158,11 +142,6 @@ export class RemixAIPlugin extends ViewPlugin {
   }
 
   async error_explaining(prompt: string, context: string="", params: IParams=GenerationParams): Promise<any> {
-    if (this.isInferencing) {
-      this.call('terminal', 'log', { type: 'aitypewriterwarning', value: "RemixAI is already busy!" })
-      return
-    }
-
     let result
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       result = await this.call(this.remixDesktopPluginName, 'error_explaining', prompt)
@@ -173,6 +152,22 @@ export class RemixAIPlugin extends ViewPlugin {
     return result
   }
 
+  async vulnerability_check(prompt: string, params: IParams=GenerationParams): Promise<any> {
+    let result
+    if (this.isOnDesktop && !this.useRemoteInferencer) {
+      result = await this.call(this.remixDesktopPluginName, 'vulnerability_check', prompt)
+
+    } else {
+      result = await this.remoteInferencer.vulnerability_check(prompt, params)
+    }
+    if (result && params.terminal_output) this.call('terminal', 'log', { type: 'aitypewriterwarning', value: result })
+    return result
+  }
+
+  getVulnerabilityReport(file: string): any {
+    return this.securityAgent.getReport(file)
+  }
+
   async code_insertion(msg_pfx: string, msg_sfx: string): Promise<any> {
     if (this.isOnDesktop && !this.useRemoteInferencer) {
       return await this.call(this.remixDesktopPluginName, 'code_insertion', msg_pfx, msg_sfx)
@@ -193,12 +188,14 @@ export class RemixAIPlugin extends ViewPlugin {
         if (fn === "code_explaining") ChatApi.composer.send("Explain the current code")
         else if (fn === "error_explaining") ChatApi.composer.send("Explain the error")
         else if (fn === "solidity_answer") ChatApi.composer.send("Answer the following question")
-        else console.log("chatRequestBuffer is not empty. First process the last request.")
+        else if (fn === "vulnerability_check") ChatApi.composer.send("Is there any vulnerability in the pasted code?")
+        else console.log("chatRequestBuffer function name not recognized.")
       }
     }
     else {
-      console.log("chatRequestBuffer is not empty. First process the last request.")
+      console.log("chatRequestBuffer is not empty. First process the last request.", this.chatRequestBuffer)
     }
+    _paq.push(['trackEvent', 'ai', 'remixAI_chat', 'askFromTerminal'])
   }
 
   async ProcessChatRequestBuffer(params:IParams=GenerationParams){
diff --git a/apps/remix-ide/src/app/providers/environment-explorer.tsx b/apps/remix-ide/src/app/providers/environment-explorer.tsx
index a38c0d74d3..dab429a671 100644
--- a/apps/remix-ide/src/app/providers/environment-explorer.tsx
+++ b/apps/remix-ide/src/app/providers/environment-explorer.tsx
@@ -78,6 +78,15 @@ export class EnvironmentExplorer extends ViewPlugin {
     }
   }
 
+  async deleteForkedState (provider) {
+    const providerName = await this.call('blockchain', 'getProvider')
+    if (providerName !== provider.name) {
+      await this.call('fileManager', 'remove', `.states/forked_states/${provider.displayName}.json`)
+      await this.call('blockchain', 'removeProvider', provider.name)
+      this.call('notification', 'toast', `Environment "${provider.displayName}" deleted successfully.`)
+    } else this.call('notification', 'toast', 'Cannot delete the current selected environment')
+  }
+
   renderComponent() {
     this.dispatch({
       ...this.state
@@ -86,7 +95,12 @@ export class EnvironmentExplorer extends ViewPlugin {
 
   updateComponent(state: EnvironmentExplorerState) {
     return (<>
-      <EnvironmentExplorerUI pinStateCallback={this.pinStateCallback.bind(this)} profile={profile} state={state} />
+      <EnvironmentExplorerUI
+        pinStateCallback={this.pinStateCallback.bind(this)}
+        deleteForkedState={this.deleteForkedState.bind(this)}
+        profile={profile}
+        state={state}
+      />
     </>)
   }
 }
diff --git a/apps/remix-ide/src/app/providers/style/environment-explorer.css b/apps/remix-ide/src/app/providers/style/environment-explorer.css
index b5770fba42..8e69456504 100644
--- a/apps/remix-ide/src/app/providers/style/environment-explorer.css
+++ b/apps/remix-ide/src/app/providers/style/environment-explorer.css
@@ -1,5 +1,5 @@
 .EECellStyle {
-  min-height: 6rem;
+  min-height: 8rem;
   max-width: 12rem;
-  min-width: 10rem;
+  min-width: 12rem;
 }
diff --git a/apps/remix-ide/src/app/tabs/analysis-tab.js b/apps/remix-ide/src/app/tabs/analysis-tab.js
index 77080b1770..90d0900fb8 100644
--- a/apps/remix-ide/src/app/tabs/analysis-tab.js
+++ b/apps/remix-ide/src/app/tabs/analysis-tab.js
@@ -22,7 +22,7 @@ const profile = {
   maintainedBy: 'Remix'
 }
 
-class AnalysisTab extends ViewPlugin {
+export default class AnalysisTab extends ViewPlugin {
   constructor () {
     super(profile)
     this.event = new EventManager()
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index 70f0d498a7..eed9cb6818 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -28,7 +28,7 @@ const profile = {
 // - events: ['compilationFinished'],
 // - methods: ['getCompilationResult']
 
-class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
+export default class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerApi
   constructor (config, fileManager) {
     super(profile)
     this.fileManager = fileManager
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 9560713ffe..0e30f19b2f 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -22,7 +22,7 @@ const profile = {
   maintainedBy: 'Remix'
 }
 
-export class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
+export default class DebuggerTab extends DebuggerApiMixin(ViewPlugin) {
   constructor () {
     super(profile)
     this.el = document.createElement('div')
diff --git a/apps/remix-ide/src/app/tabs/locale-module.js b/apps/remix-ide/src/app/tabs/locale-module.js
index f4b3252df1..5ce5048ab1 100644
--- a/apps/remix-ide/src/app/tabs/locale-module.js
+++ b/apps/remix-ide/src/app/tabs/locale-module.js
@@ -77,6 +77,7 @@ export class LocaleModule extends Plugin {
     const next = localeCode || this.active // Name
     if (next === this.active) return // --> exit out of this method
     _paq.push(['trackEvent', 'localeModule', 'switchTo', next])
+    
     const nextLocale = this.locales[next] // Locale
     if (!this.forced) this._deps.config.set('settings/locale', next)
 
diff --git a/apps/remix-ide/src/app/tabs/locales/en/contractverification.json b/apps/remix-ide/src/app/tabs/locales/en/contractverification.json
new file mode 100644
index 0000000000..02d003f683
--- /dev/null
+++ b/apps/remix-ide/src/app/tabs/locales/en/contractverification.json
@@ -0,0 +1,30 @@
+{
+  "contract-verification.verifyNavTitle": "Verify",
+  "contract-verification.receiptsNavTitle": "Receipts",
+  "contract-verification.lookupNavTitle": "Lookup",
+  "contract-verification.settingsNavTitle": "Settings",
+  "contract-verification.contractAddressInput": "Contract Address",
+  "contract-verification.proxyContractAddressInput": "Proxy Address",
+  "contract-verification.proxyInputLabel": "The deployed contract is behind a proxy",
+  "contract-verification.panelDisplayName": "Contract Verification",
+  "contract-verification.searchableChainDropdownLabel": "Chain",
+  "contract-verification.contractAddressError": "Please enter a valid contract address",
+  "contract-verification.chainError": "Please select the chain.",
+  "contract-verification.proxyAddressError": "Please provide a valid proxy contract address.",
+  "contract-verification.verifyButton": "Verify",
+  "contract-verification.lookupButton": "Lookup",
+  "contract-verification.receipts.noContractsSubmitted": "No contracts submitted for verification",
+  "contract-verification.receiptsDefaultLayout.description": "Check the verification statuses of contracts submitted for verification",
+  "contract-verification.verifyDefaultLayout.description": "Verify compiled contracts on different verification services",
+  "contract-verification.lookupDefaultLayout.description": "Search for verified contracts and download them to Remix",
+  "contract-verification.settingsDefaultLayout.description": "Customize settings for each verification service and chain",
+  "contract-verification.configInputPlaceholderText": "Add {label}",
+  "contract-verification.configInputSaveButton": "Save",
+  "contract-verification.configInputCancelButton": "Cancel",
+  "contract-verification.constructorArgumentsToggleRawInput": "Enter raw ABI-encoded constructor arguments",
+  "contract-verification.constructorArgumentsRawAbiEncodingResult": "ABI-encoded constructor arguments",
+  "contract-verification.contractDropdownLabel": "{label}",
+  "contract-verification.contractDropDownDefaultText": "Compiled contract required"
+}
+
+
diff --git a/apps/remix-ide/src/app/tabs/locales/en/editor.json b/apps/remix-ide/src/app/tabs/locales/en/editor.json
index 6f0f367555..b5a06a18ad 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/editor.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/editor.json
@@ -28,6 +28,7 @@
   "editor.explainFunctionByAI": "```\n{content}\n```\nExplain the function {currentFunction}",
   "editor.explainFunctionByAISol": "```\n{content}\n```\nExplain the function {currentFunction}",
   "editor.ExplainPipeMessage": "```\n {content}\n```\nExplain the snipped above",
+  "editor.PastedCodeSafety": "```\n {content}\n```\n\nReply in a short manner: Does this code contain major security vulnerabilities leading to a scam or loss of funds?",
   "editor.executeFreeFunction": "Run a free function",
   "editor.executeFreeFunction2": "Run the free function \"{name}\"",
   "editor.toastText1": "This can only execute free function",
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 a638fd2b02..e4e5554eb4 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/home.json
@@ -26,6 +26,7 @@
   "home.solhintPluginDesc": "Solhint is an open source project for linting Solidity code.",
   "home.sourcifyPluginDesc": "Solidity contract and metadata verification service.",
   "home.unitTestPluginDesc": "Write and run unit tests for your contracts in Solidity.",
+  "home.contractVerificationDesc": "Verify contracts on multiple services at the same time.",
   "home.dgitPluginDesc": "Add source control to your projects.",
   "home.oneClickDappDesc": "Quickly generate smart contract interfaces",
   "home.getStarted": "Get Started",
diff --git a/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json b/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json
index f6de5d5e42..281e5c2275 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/pluginManager.json
@@ -2,8 +2,8 @@
   "pluginManager.displayName": "Plugin manager",
   "pluginManager.activate": "Activate",
   "pluginManager.deactivate": "Deactivate",
-  "pluginManager.activeModules": "Active Modules",
-  "pluginManager.inactiveModules": "Inactive Modules",
+  "pluginManager.activeModules": "Active Plugins",
+  "pluginManager.inactiveModules": "Inactive Plugins",
   "pluginManager.connectLocal": "Connect to a Local Plugin",
   "pluginManager.localForm.title": "Local Plugin",
   "pluginManager.localForm.pluginName": "Plugin Name",
diff --git a/apps/remix-ide/src/app/tabs/locales/en/udapp.json b/apps/remix-ide/src/app/tabs/locales/en/udapp.json
index 00e49554fb..c4a376cd20 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/udapp.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/udapp.json
@@ -50,12 +50,15 @@
   "udapp.hash": "hash",
   "udapp.signature": "signature",
   "udapp.forkStateTitle": "Fork VM state",
-  "udapp.forkStateLabel": "State Name",
+  "udapp.forkStateLabel": "New environment name",
+  "udapp.forkVmStateDesc1":"Forking state will create a new environment with same state as selected environment",
+  "udapp.forkVmStateDesc2":"After forking, new environment will be pinned and selected automatically. It can be unpinned or deleted using Envionment Explorer",
   "udapp.fork": "Fork",
-  "udapp.deleteVmStateTitle": "Delete VM state",
-  "udapp.deleteVmStateDesc1": "Deleting the state of this VM will delete the associated transaction details in this Workspace.",
-  "udapp.deleteVmStateDesc2": "It will also delete the data of contracts deployed and pinned in this Workspace.",
-  "udapp.deleteVmStateDesc3": "Do you want to continue?",
+  "udapp.resetVmStateTitle": "Reset VM state",
+  "udapp.resetVmStateDesc1": "Resetting the state of this VM will delete the associated transaction details in this Workspace.",
+  "udapp.resetVmStateDesc2": "It will also delete the data of contracts deployed and pinned in this Workspace.",
+  "udapp.resetVmStateDesc3": "Do you want to continue?",
+  "udapp.reset": "Reset",
   "udapp.delete": "Delete",
   "udapp.injectedTitle": "Unfortunately it's not possible to create an account using injected provider. Please create the account directly from your provider (i.e metamask or other of the same type).",
   "udapp.createNewAccount": "Create new account",
diff --git a/apps/remix-ide/src/app/tabs/locales/es/panel.json b/apps/remix-ide/src/app/tabs/locales/es/panel.json
index 44aab809a3..c59878c7e8 100644
--- a/apps/remix-ide/src/app/tabs/locales/es/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/es/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "Mantenido por",
   "panel.documentation": "Documentación",
   "panel.description": "Descripción",
+  "panel.displayName": "Nombre para mostrar",
   "panel.maintainedByRemix": "Mantenido por Remix",
   "panel.pluginInfo": "Información del Complemento",
   "panel.linkToDoc": "Enlace a la documentación",
diff --git a/apps/remix-ide/src/app/tabs/locales/fr/panel.json b/apps/remix-ide/src/app/tabs/locales/fr/panel.json
index 8deab3169a..b9cc63205d 100644
--- a/apps/remix-ide/src/app/tabs/locales/fr/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/fr/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "Maintenu par :",
   "panel.documentation": "Documentation",
   "panel.description": "Description",
+  "panel.displayName": "Nom d'affichage",
   "panel.maintainedByRemix": "Maintenu par Remix",
   "panel.pluginInfo": "Informations sur l'extension",
   "panel.linkToDoc": "Lien vers la documentation",
diff --git a/apps/remix-ide/src/app/tabs/locales/it/panel.json b/apps/remix-ide/src/app/tabs/locales/it/panel.json
index 400b39508e..43ada89b6f 100644
--- a/apps/remix-ide/src/app/tabs/locales/it/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/it/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "Mantenuto Da",
   "panel.documentation": "Documentazione",
   "panel.description": "Descrizione",
+  "panel.displayName": "Nome visualizzato",
   "panel.maintainedByRemix": "Mantenuto da Remix",
   "panel.pluginInfo": "Informazioni sul plugin",
   "panel.linkToDoc": "Link alla documentazione",
diff --git a/apps/remix-ide/src/app/tabs/locales/ko/panel.json b/apps/remix-ide/src/app/tabs/locales/ko/panel.json
index b6e86b5699..6924890804 100644
--- a/apps/remix-ide/src/app/tabs/locales/ko/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/ko/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "유지 관리:",
   "panel.documentation": "문서",
   "panel.description": "상세정보",
+  "panel.displayName": "표시 이름",
   "panel.maintainedByRemix": "리믹스에 의한 유지 관리",
   "panel.pluginInfo": "플러그인 정보",
   "panel.linkToDoc": "문서 링크",
diff --git a/apps/remix-ide/src/app/tabs/locales/ru/panel.json b/apps/remix-ide/src/app/tabs/locales/ru/panel.json
index 066069d5bd..c6f28cdf89 100644
--- a/apps/remix-ide/src/app/tabs/locales/ru/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/ru/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "Поддерживается",
   "panel.documentation": "Документация",
   "panel.description": "Описание",
+  "panel.displayName": "Отображаемое имя",
   "panel.maintainedByRemix": "Поддерживается Remix",
   "panel.pluginInfo": "Информация о плагине",
   "panel.linkToDoc": "Ссылка на документацию",
diff --git a/apps/remix-ide/src/app/tabs/locales/zh/panel.json b/apps/remix-ide/src/app/tabs/locales/zh/panel.json
index e1a63ff928..5d915e775c 100644
--- a/apps/remix-ide/src/app/tabs/locales/zh/panel.json
+++ b/apps/remix-ide/src/app/tabs/locales/zh/panel.json
@@ -3,6 +3,7 @@
   "panel.maintainedBy": "维护者",
   "panel.documentation": "文档",
   "panel.description": "描述",
+  "panel.displayName": "显示名称",
   "panel.maintainedByRemix": "由 Remix 维护",
   "panel.pluginInfo": "插件信息",
   "panel.linkToDoc": "文档链接",
diff --git a/apps/remix-ide/src/app/tabs/script-runner-ui.tsx b/apps/remix-ide/src/app/tabs/script-runner-ui.tsx
index 7e108c71ca..dd79bc79e5 100644
--- a/apps/remix-ide/src/app/tabs/script-runner-ui.tsx
+++ b/apps/remix-ide/src/app/tabs/script-runner-ui.tsx
@@ -71,7 +71,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
     })
 
     this.plugin.on('fileManager', 'fileSaved', async (file: string) => {
-
       if (file === configFileName && this.enableCustomScriptRunner) {
         await this.loadCustomConfig()
         this.renderComponent()
@@ -114,7 +113,8 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
         activateCustomScriptRunner={this.activateCustomScriptRunner.bind(this)}
         saveCustomConfig={this.saveCustomConfig.bind(this)}
         openCustomConfig={this.openCustomConfig.bind(this)}
-        loadScriptRunner={this.selectScriptRunner.bind(this)} />
+        loadScriptRunner={this.selectScriptRunner.bind(this)}
+      />
     )
   }
 
@@ -184,7 +184,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
     this.setIsLoading(config.name, false)
     this.renderComponent()
     return result
-
   }
 
   async execute(script: string, filePath: string) {
@@ -289,7 +288,6 @@ export class ScriptRunnerUIPlugin extends ViewPlugin {
         }
       }
     }
-
   }
 
   async openCustomConfig() {
diff --git a/apps/remix-ide/src/app/tabs/settings-tab.tsx b/apps/remix-ide/src/app/tabs/settings-tab.tsx
index 08557e3a31..8a5ac39a94 100644
--- a/apps/remix-ide/src/app/tabs/settings-tab.tsx
+++ b/apps/remix-ide/src/app/tabs/settings-tab.tsx
@@ -27,7 +27,7 @@ const profile = {
   maintainedBy: 'Remix'
 }
 
-module.exports = class SettingsTab extends ViewPlugin {
+export default class SettingsTab extends ViewPlugin {
   config: any = {}
   editor: any
   private _deps: {
diff --git a/apps/remix-ide/src/app/tabs/test-tab.js b/apps/remix-ide/src/app/tabs/test-tab.js
index 6a317cdacd..8d695366fd 100644
--- a/apps/remix-ide/src/app/tabs/test-tab.js
+++ b/apps/remix-ide/src/app/tabs/test-tab.js
@@ -22,7 +22,7 @@ const profile = {
   maintainedBy: 'Remix'
 }
 
-module.exports = class TestTab extends ViewPlugin {
+export default class TestTab extends ViewPlugin {
   constructor (fileManager, offsetToLineColumnConverter, filePanel, compileTab, appManager, contentImport) {
     super(profile)
     this.compileTab = compileTab
diff --git a/apps/remix-ide/src/app/tabs/theme-module.js b/apps/remix-ide/src/app/tabs/theme-module.js
index 53bb7f542d..fb9cfd6cff 100644
--- a/apps/remix-ide/src/app/tabs/theme-module.js
+++ b/apps/remix-ide/src/app/tabs/theme-module.js
@@ -118,7 +118,7 @@ export class ThemeModule extends Plugin {
     }
     const next = themeName || this.active // Name
     if (next === this.active) return // --> exit out of this method
-    _paq.push(['trackEvent', 'themeModule', 'switchTo', next])
+    _paq.push(['trackEvent', 'themeModule', 'switchThemeTo', next])
     const nextTheme = this.themes[next] // Theme
     if (!this.forced) this._deps.config.set('settings/theme', next)
     document.getElementById('theme-link') ? document.getElementById('theme-link').remove() : null
diff --git a/apps/remix-ide/src/app/udapp/run-tab.tsx b/apps/remix-ide/src/app/udapp/run-tab.tsx
index 600d4f79f0..f63b81e55c 100644
--- a/apps/remix-ide/src/app/udapp/run-tab.tsx
+++ b/apps/remix-ide/src/app/udapp/run-tab.tsx
@@ -160,13 +160,15 @@ export class RunTab extends ViewPlugin {
       'injected-metamask-gnosis': 'Deploy to Gnosis through the Metamask browser extension.',
       'injected-metamask-arbitrum': 'Deploy to Arbitrum through the Metamask browser extension.',
       'injected-metamask-sepolia': 'Deploy to the Sepolia testnet through the Metamask browser extension.',
-      'injected-metamask-ephemery': 'Deploy to the Ephemery testnet through the Metamask browser extension.'
+      'injected-metamask-ephemery': 'Deploy to the Ephemery testnet through the Metamask browser extension.',
+      'injected-metamask-linea': 'Deploy to Linea through the Metamask browser extension.'
     }
 
     const logos = {
       'injected-metamask-optimism': ['assets/img/optimism-ethereum-op-logo.png', 'assets/img/metamask.png'],
       'injected-metamask-arbitrum': ['assets/img/arbitrum-arb-logo.png', 'assets/img/metamask.png'],
       'injected-metamask-gnosis': ['assets/img/gnosis_chain.png', 'assets/img/metamask.png'],
+      'injected-metamask-linea': ['assets/img/linea_chain.png', 'assets/img/metamask.png'],
       'injected-metamask-sepolia': ['assets/img/metamask.png'],
       'injected-metamask-ephemery': ['assets/img/metamask.png'],
       'injected-MetaMask': ['assets/img/metamask.png'],
@@ -243,6 +245,7 @@ export class RunTab extends ViewPlugin {
             "decimals": 18
           })
         */
+        await addCustomInjectedProvider(11, event, 'injected-metamask-linea', 'L2 - Linea', '0xe708', ['https://rpc.linea.build'])
       }
     }
 
diff --git a/apps/remix-ide/src/assets/img/contractVerification.webp b/apps/remix-ide/src/assets/img/contractVerification.webp
new file mode 100644
index 0000000000..6d7dd5ae6d
Binary files /dev/null and b/apps/remix-ide/src/assets/img/contractVerification.webp differ
diff --git a/apps/remix-ide/src/assets/img/linea_chain.png b/apps/remix-ide/src/assets/img/linea_chain.png
new file mode 100644
index 0000000000..cd527f52e9
Binary files /dev/null and b/apps/remix-ide/src/assets/img/linea_chain.png differ
diff --git a/apps/remix-ide/src/assets/img/solSurvey2024.webp b/apps/remix-ide/src/assets/img/solSurvey2024.webp
new file mode 100644
index 0000000000..c7d265673a
Binary files /dev/null and b/apps/remix-ide/src/assets/img/solSurvey2024.webp differ
diff --git a/apps/remix-ide/src/assets/img/soliditySurvey2023.webp b/apps/remix-ide/src/assets/img/soliditySurvey2023.webp
deleted file mode 100644
index eb0a022e62..0000000000
Binary files a/apps/remix-ide/src/assets/img/soliditySurvey2023.webp and /dev/null differ
diff --git a/apps/remix-ide/src/blockchain/blockchain.tsx b/apps/remix-ide/src/blockchain/blockchain.tsx
index 93c01355b4..ffca9e766b 100644
--- a/apps/remix-ide/src/blockchain/blockchain.tsx
+++ b/apps/remix-ide/src/blockchain/blockchain.tsx
@@ -157,7 +157,7 @@ export class Blockchain extends Plugin {
       _paq.push(['trackEvent', 'blockchain', 'providerPinned', name])
       this.emit('providersChanged')
       this.changeExecutionContext({ context: name }, null, null, null)
-      this.call('notification', 'toast', `VM state '${providerName}' forked and selected as current envionment.`)
+      this.call('notification', 'toast', `New environment '${providerName}' created with forked state.`)
     })
 
     this.on('environmentExplorer', 'providerUnpinned', (name, provider) => {
@@ -687,6 +687,7 @@ export class Blockchain extends Plugin {
   }
 
   removeProvider(name) {
+    if (this.pinnedProviders.includes(name)) this.emit('shouldRemoveProviderFromUdapp', name, this.getProviderObjByName(name))
     this.executionContext.removeProvider(name)
     this.emit('providersChanged')
   }
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index ec25790386..0417952960 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -149,7 +149,8 @@ export function isNative(name) {
     'templateSelection',
     'walletconnect',
     'contract-verification',
-    'popupPanel'
+    'popupPanel',
+    'LearnEth',
   ]
   return nativePlugins.includes(name) || requiredModules.includes(name) || isInjectedProvider(name) || isVM(name) || isScriptRunner(name)
 }
diff --git a/apps/remix-ide/team-best-practices.md b/apps/remix-ide/team-best-practices.md
index 2088cd5bf9..477f1304a0 100644
--- a/apps/remix-ide/team-best-practices.md
+++ b/apps/remix-ide/team-best-practices.md
@@ -158,7 +158,7 @@ Before starting to coding, we should ensure all devs / contributors are aware of
 ### 1) Bugs:
 - A critical bug should get the label `Blocker`, and every effort should be put to fix it.
 - Addressing a non critical and non planned bug can be done:
-  - After having notified in the `remix-dev` channel if the bug does not involves UX or public API changes.
+  - After having notified in the `remix-dev` channel if the bug does not involve UX or public API changes.
   - After a dev meeting (e.g the regular standup) if the bug involves any UX or public API changes.
 
 ### 2) Support:
diff --git a/apps/remix-ide/webpack.config.js b/apps/remix-ide/webpack.config.js
index 08419aeb27..82a8ea3bfb 100644
--- a/apps/remix-ide/webpack.config.js
+++ b/apps/remix-ide/webpack.config.js
@@ -128,7 +128,7 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
     })
   )
 
-  // souce-map loader
+  // source-map loader
   config.module.rules.push({
     test: /\.js$/,
     use: ['source-map-loader'],
diff --git a/apps/remixdesktop/README.md b/apps/remixdesktop/README.md
index e854386a6a..9dc94b67e5 100644
--- a/apps/remixdesktop/README.md
+++ b/apps/remixdesktop/README.md
@@ -4,13 +4,13 @@
 
 ### Running the app locally
 
-In the main repo yarn, then run yarn serve 
+In the main repo run yarn, then run yarn serve  
 In this directory apps/remixdesktop, yarn, then run: yarn start:dev to boot the electron app
 
 Then, the app will be started in live reload mode, and anything you do in Remix IDE will be reloaded.
 It will not however reload electron code. You need to rerun yarn start:dev every time. 
 
-If you run into issues with yarn when native node modules are being rebuilt you need
+If you run into issues with yarn when native node modules are being rebuilt, you need
 - Windows: install Visual Studio Tools with Desktop Development C++ enabled in the Workloads
 - MacOS: install Xcode or Xcode Command Line Tools. Also make sure the compilers (clang++ | g++) target the right sdk includes, ```export SDKROOT="xcrun --show-sdk-path"```
 - Linux: unknown, probably a C++ compiler
@@ -44,7 +44,7 @@ const clientProfile: Profile = {
 
 As you can see in the clientProfile you define the methods which are exposed to the Remix plugin system.
 
-5. add a base plugin and a plugin client
+4. add a base plugin and a plugin client
 ```
 export class CompilerLoaderPlugin extends ElectronBasePlugin {
   clients: CompilerLoaderPluginClient[] = []
@@ -71,7 +71,7 @@ The ElectronBasePluginClient is the specific instance which will be connected to
 
 Any instance specific code is set as functions on the ElectronBasePluginClient class.
 
-6. If you need fs access you need to track the workingdir like we do here:
+5. If you need fs access you need to track the workingdir like we do here:
 This ensures you know where the user is working
 
 ```
@@ -92,7 +92,7 @@ class IsoGitPluginClient extends ElectronBasePluginClient {
 
   ```
 
-7. If you need to call methods on the BASE which holds all the clients you can add methods there, for example this iterates over clients 
+6. If you need to call methods on the BASE which holds all the clients you can add methods there, for example this iterates over clients 
 and finds the one with the webContentsId. This ID passed on ie by menu items. Look at menu.ts to see how that works.
 
 ```
@@ -104,21 +104,21 @@ and finds the one with the webContentsId. This ID passed on ie by menu items. Lo
   }
 ```
 
-8. Add your plugin to engine.ts
+7. Add your plugin to engine.ts
 
 ```
 const compilerLoaderPlugin = new CompilerLoaderPlugin()
 ```
 
-9. Register the plugin in engine.ts
+8. Register the plugin in engine.ts
 
 ```
 engine.register(compilerLoaderPlugin)
 ```
 
-10. activation of plugins is done when the clients connect to the engine. No need to activate it. 
+9. activation of plugins is done when the clients connect to the engine. No need to activate it. 
 
-11. Add the plugin to the preload.ts. Add it to this list:
+10. Add the plugin to the preload.ts. Add it to this list:
 
 ```
 const exposedPLugins = ['fs', 'git', 'xterm', 'isogit', 'electronconfig', 'electronTemplates', 'ripgrep', 'compilerloader', 'appUpdater']
@@ -126,7 +126,7 @@ const exposedPLugins = ['fs', 'git', 'xterm', 'isogit', 'electronconfig', 'elect
 
 If you don't do this, it won't work.
 
-12. In Remix IDE create a plugin in src/app/plugins/electron. If everything works correctly the methods will be loaded from the electron side, no need to specify them here.
+11. In Remix IDE create a plugin in src/app/plugins/electron. If everything works correctly the methods will be loaded from the electron side, no need to specify them here.
 This plugin is only a passthrough. 
 
 ```
@@ -150,11 +150,10 @@ export class compilerLoaderPluginDesktop extends ElectronPlugin {
 }
 ```
 
-13. if you need to activate that on load you need to add it to the app.js where other plugins are activated.
+12. if you need to activate that on load you need to add it to the app.js where other plugins are activated.
 
 
 
 ## CI
 
 CI will only run the builds if the branch is master or contains the word: desktop
-
diff --git a/apps/remixdesktop/src/lib/InferenceServerManager.ts b/apps/remixdesktop/src/lib/InferenceServerManager.ts
index 231e815914..ffd6342bca 100644
--- a/apps/remixdesktop/src/lib/InferenceServerManager.ts
+++ b/apps/remixdesktop/src/lib/InferenceServerManager.ts
@@ -6,7 +6,7 @@ import { EventEmitter } from 'events';
 import { ICompletions, IModel, IParams, InsertionParams,
   CompletionParams, GenerationParams, ModelType, AIRequestType,
   IStreamResponse, ChatHistory, downloadLatestReleaseExecutable,
-  buildSolgptPromt } from "@remix/remix-ai-core"
+  buildSolgptPrompt } from "@remix/remix-ai-core"
 import { platform } from 'os';
 
 class ServerStatusTimer {
@@ -149,8 +149,8 @@ export class InferenceManager implements ICompletions {
     } else {
       // Server is running with successful request
       // console.log('Inference server is running')
-      // console.log('completion is runnig', state.data?.completion)
-      // console.log('general is runnig', state.data?.general)
+      // console.log('completion is running', state.data?.completion)
+      // console.log('general is running', state.data?.general)
     }
     // this._handleResources()
   }
@@ -176,7 +176,7 @@ export class InferenceManager implements ICompletions {
         }
         if (model.modelReqs.GPURequired) {
           if (gpu_available.length < 1) {
-            if (logger)console.warn('GPU requiredfor desktop inference but not available')
+            if (logger)console.warn('GPU required for desktop inference but not available')
           }
         }
       }
@@ -517,7 +517,7 @@ export class InferenceManager implements ICompletions {
         modelOP = model.modelOP
       }
     }
-    const prompt = buildSolgptPromt(userPrompt, modelOP)
+    const prompt = buildSolgptPrompt(userPrompt, modelOP)
 
     if (params.stream_result) {
       return this._streamInferenceRequest('solidity_answer', { prompt, ...params })
diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts
index 3aa370882a..f4d2615f93 100644
--- a/apps/remixdesktop/test/tests/app/foundry.test.ts
+++ b/apps/remixdesktop/test/tests/app/foundry.test.ts
@@ -89,7 +89,7 @@ async function installFoundry(): Promise<void> {
             server.stdout.on('data', function (data) {
                 console.log(data.toString())
                 if (
-                    data.toString().includes("foundryup: done!")
+                    data.toString().includes("foundryup: use - chisel 0.3.0")
                 ) {
                     console.log('resolving')
                     resolve()
diff --git a/apps/vyper/.browserslistrc b/apps/vyper/.browserslistrc
index f1d12df4fa..2f1ad55c32 100644
--- a/apps/vyper/.browserslistrc
+++ b/apps/vyper/.browserslistrc
@@ -10,7 +10,7 @@
 last 1 Chrome version
 last 1 Firefox version
 last 2 Edge major versions
-last 2 Safari major version
+last 2 Safari major versions
 last 2 iOS major versions
 Firefox ESR
-not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
+not IE 9-11 # For IE 9-11 support, remove 'not'.
diff --git a/apps/vyper/src/app/app.tsx b/apps/vyper/src/app/app.tsx
index b7d48329d0..eadce98f8f 100644
--- a/apps/vyper/src/app/app.tsx
+++ b/apps/vyper/src/app/app.tsx
@@ -56,8 +56,8 @@ const App = () => {
       try {
         remixClient.call('locale' as any, 'currentLocale').then((currentLocale) => {
           setLocale(currentLocale)
-        })        
-  
+        })
+
         remixClient.on('locale' as any, 'localeChanged', (locale: any) => {
           setLocale(locale)
         })
@@ -118,113 +118,113 @@ const App = () => {
 
   return (
     <IntlProvider locale={locale.code} messages={locale.messages}>
-    <main id="vyper-plugin">
-      <section>
-        <div className="px-3 pt-3 mb-3 w-100">
-          <CustomTooltip placement="bottom" tooltipText="Clone a repo of Vyper examples. Switch to the File Explorer to see the examples.">
-            <button data-id="add-repository" className="w-100 text-dark btn border" onClick={() => {
-              {cloneCount === 0 ? remixClient.cloneVyperRepo() : remixClient.cloneVyperRepo(cloneCount)}
-              setCloneCount((prev) => {
-                return ++prev
-              })
-            }}>
+      <main id="vyper-plugin">
+        <section>
+          <div className="px-3 pt-3 mb-3 w-100">
+            <CustomTooltip placement="bottom" tooltipText="Clone a repo of Vyper examples. Switch to the File Explorer to see the examples.">
+              <button data-id="add-repository" className="w-100 text-dark btn border" onClick={() => {
+                {cloneCount === 0 ? remixClient.cloneVyperRepo() : remixClient.cloneVyperRepo(cloneCount)}
+                setCloneCount((prev) => {
+                  return ++prev
+                })
+              }}>
               Clone a repo of Vyper examples
-            </button>
-          </CustomTooltip>
-        </div>
-
-        <Accordion className="border-0 w-100 accordion-background">
-          <div className="border-0">
-            <div className="">
-              <CustomAccordionToggle eventKey="0">
-                <label style={{fontSize: "1REM"}}>Configurations</label>
-              </CustomAccordionToggle>
-            </div>
-            <Accordion.Collapse eventKey="0">
-              <div className="pb-2 border-bottom">
-                <Form>
-                  <div className="d-flex flex-row justify-content-around mb-1 mt-2">
-                    <div className={`custom-control custom-radio ${state.environment === 'remote' ? 'd-flex' : 'd-flex cursor-status'}`}>
-                      <input
-                        type="radio"
-                        id="remote-compiler"
-                        data-id="remote-compiler"
-                        name="remote"
-                        value={state.environment}
-                        checked={state.environment === 'remote'}
-                        onChange={() => setEnvironment('remote')}
-                        className={`custom-control-input ${state.environment === 'remote' ? 'd-flex mr-1' : 'd-flex mr-1 cursor-status'}`}
-                      />
-                      <label
-                        htmlFor="remote-compiler"
-                        className="form-check-label custom-control-label"
-                        style={{ paddingTop: '0.19rem' }}
-                      >Remote Compiler</label>
-                    </div>
-                    <div className={`custom-control custom-radio ${state.environment === 'local' ? 'mr-2' : `cursor-status`}`}>
-                      <input
-                        id="local-compiler"
-                        data-id="local-compiler"
-                        checked={state.environment === 'local'}
-                        type="radio"
-                        name="local"
-                        value={state.environment}
-                        onChange={() => setEnvironment('local')}
-                        className={`custom-control-input  ${state.environment === 'local' ? '' : `cursor-status`}`}
-                      />
-                      <label
-                        htmlFor="local-compiler"
-                        className="form-check-label custom-control-label"
-                        style={{ paddingTop: '0.19rem' }}
-                      >Local Compiler</label>
-                    </div>
-                  </div>
-                </Form>
-                <LocalUrlInput url={state.localUrl} setUrl={setLocalUrl} environment={state.environment} />
-              </div>
-            </Accordion.Collapse>
+              </button>
+            </CustomTooltip>
           </div>
-        </Accordion>
-        <span className="w-100 px-3 mt-3 mb-1 small text-warning">
+
+          <Accordion className="border-0 w-100 accordion-background">
+            <div className="border-0">
+              <div className="">
+                <CustomAccordionToggle eventKey="0">
+                  <label style={{ fontSize: "1REM" }}>Configurations</label>
+                </CustomAccordionToggle>
+              </div>
+              <Accordion.Collapse eventKey="0">
+                <div className="pb-2 border-bottom">
+                  <Form>
+                    <div className="d-flex flex-row justify-content-around mb-1 mt-2">
+                      <div className={`custom-control custom-radio ${state.environment === 'remote' ? 'd-flex' : 'd-flex cursor-status'}`}>
+                        <input
+                          type="radio"
+                          id="remote-compiler"
+                          data-id="remote-compiler"
+                          name="remote"
+                          value={state.environment}
+                          checked={state.environment === 'remote'}
+                          onChange={() => setEnvironment('remote')}
+                          className={`custom-control-input ${state.environment === 'remote' ? 'd-flex mr-1' : 'd-flex mr-1 cursor-status'}`}
+                        />
+                        <label
+                          htmlFor="remote-compiler"
+                          className="form-check-label custom-control-label"
+                          style={{ paddingTop: '0.19rem' }}
+                        >Remote Compiler</label>
+                      </div>
+                      <div className={`custom-control custom-radio ${state.environment === 'local' ? 'mr-2' : `cursor-status`}`}>
+                        <input
+                          id="local-compiler"
+                          data-id="local-compiler"
+                          checked={state.environment === 'local'}
+                          type="radio"
+                          name="local"
+                          value={state.environment}
+                          onChange={() => setEnvironment('local')}
+                          className={`custom-control-input  ${state.environment === 'local' ? '' : `cursor-status`}`}
+                        />
+                        <label
+                          htmlFor="local-compiler"
+                          className="form-check-label custom-control-label"
+                          style={{ paddingTop: '0.19rem' }}
+                        >Local Compiler</label>
+                      </div>
+                    </div>
+                  </Form>
+                  <LocalUrlInput url={state.localUrl} setUrl={setLocalUrl} environment={state.environment} />
+                </div>
+              </Accordion.Collapse>
+            </div>
+          </Accordion>
+          <span className="w-100 px-3 mt-3 mb-1 small text-warning">
           Specify the{' '}
-          <a className="text-warning" target="_blank" href="https://remix-ide.readthedocs.io/en/latest/vyper.html#specify-vyper-version">
+            <a className="text-warning" target="_blank" href="https://remix-ide.readthedocs.io/en/latest/vyper.html#specify-vyper-version">
             compiler version
-          </a>{' '}
+            </a>{' '}
           &{' '}
-          <a className="text-warning" href="https://remix-ide.readthedocs.io/en/latest/vyper.html#evm-version" target="_blank" rel="noopener noreferrer">
+            <a className="text-warning" href="https://remix-ide.readthedocs.io/en/latest/vyper.html#evm-version" target="_blank" rel="noopener noreferrer">
             EVM version
-          </a>{' '}
+            </a>{' '}
           in the .vy file.
-        </span>
-        <div className="px-3 w-100 mb-3 mt-1" id="compile-btn">
-          <CompilerButton compilerUrl={compilerUrl()} contract={contract} setOutput={(name, update) => setOutput({ ...output, [name]: update })} resetCompilerState={resetCompilerResultState} output={output} remixClient={remixClient}/>
-        </div>
-        <article id="result" className="px-3 p-2 w-100 border-top mt-2 vyper-errorBlobs">
-          {output && output.status === 'success' && 
+          </span>
+          <div className="px-3 w-100 mb-3 mt-1" id="compile-btn">
+            <CompilerButton compilerUrl={compilerUrl()} contract={contract} setOutput={(name, update) => setOutput({ ...output, [name]: update })} resetCompilerState={resetCompilerResultState} output={output} remixClient={remixClient}/>
+          </div>
+          <article id="result" className="px-3 p-2 w-100 border-top mt-2 vyper-errorBlobs">
+            {output && output.status === 'success' &&
             <>
               <VyperResult output={output} plugin={remixClient} />
             </>
-          }
-          {output && output.status === 'failed' &&
+            }
+            {output && output.status === 'failed' &&
             output.errors && output.errors.map((error: VyperCompilationError, index: number) => {
               return <Renderer key={index}
-                  message={extractRelativePath(error.message, contract)}
-                  plugin={remixClient}
-                  context='vyper'
-                  opt={{
-                    useSpan: false,
-                    type: 'error',
-                    errorType: error.error_type,
-                    errCol: error.column,
-                    errLine: error.line ? error.line - 1 : null,
-                    errFile: contract
-                  }}
-                />
-            })            
-          }
-        </article>
-      </section>
-    </main>
+                message={extractRelativePath(error.message, contract)}
+                plugin={remixClient}
+                context='vyper'
+                opt={{
+                  useSpan: false,
+                  type: 'error',
+                  errorType: error.error_type,
+                  errCol: error.column,
+                  errLine: error.line ? error.line - 1 : null,
+                  errFile: contract
+                }}
+              />
+            })
+            }
+          </article>
+        </section>
+      </main>
     </IntlProvider>
   )
 }
diff --git a/apps/vyper/src/app/utils/compiler.tsx b/apps/vyper/src/app/utils/compiler.tsx
index 7f1c7d0f00..35657fc1c3 100644
--- a/apps/vyper/src/app/utils/compiler.tsx
+++ b/apps/vyper/src/app/utils/compiler.tsx
@@ -31,8 +31,6 @@ const compileReturnType = (output, contract): VyperCompilationResult => {
   const normal = normalizeContractPath(contract)[2]
   const abi = temp[normal]['abi']
   const evm = _.merge(temp[normal]['evm'])
-  const depByteCode = evm.deployedBytecode
-  const runtimeBytecode = evm.bytecode
   const methodIdentifiers = evm.methodIdentifiers
   // TODO: verify this is correct
   const version = output.version || '0.4.0'
@@ -52,8 +50,8 @@ const compileReturnType = (output, contract): VyperCompilationResult => {
   } = {
     contractName: normal,
     abi,
-    bytecode: depByteCode,
-    runtimeBytecode,
+    bytecode: evm.bytecode,
+    runtimeBytecode: evm.deployedBytecode,
     ir: '',
     methodIdentifiers,
     version,
diff --git a/apps/walletconnect/webpack.config.js b/apps/walletconnect/webpack.config.js
index c1ae621262..8da8a91246 100644
--- a/apps/walletconnect/webpack.config.js
+++ b/apps/walletconnect/webpack.config.js
@@ -46,7 +46,7 @@ module.exports = composePlugins(withNx(), (config) => {
       process: 'process/browser'
     })
   )
-
+  console.log(process.env.WALLET_CONNECT_PROJECT_ID)
   // set the define plugin to load the WALLET_CONNECT_PROJECT_ID
   config.plugins.push(
     new webpack.DefinePlugin({
diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index e5f1e55389..3db00ed619 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.42",
+  "version": "0.1.43",
   "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.48",
+    "@remix-project/remix-solidity": "^0.5.49",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.62",
+    "@remix-project/remix-simulator": "^0.2.63",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4"
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
 }
\ No newline at end of file
diff --git a/libs/remix-ai-core/src/agents/securityAgent.ts b/libs/remix-ai-core/src/agents/securityAgent.ts
index 9af6723f0e..a11f4408f3 100644
--- a/libs/remix-ai-core/src/agents/securityAgent.ts
+++ b/libs/remix-ai-core/src/agents/securityAgent.ts
@@ -1,28 +1,189 @@
 // security checks
 import * as fs from 'fs';
 
-class SecurityAgent {
-  private codebase: string[]; // list of codebase files
+interface SecurityReport {
+  compiled: boolean;
+  vulnerabilities: string[];
+  isNotSafe: string;
+  fileName: string;
+  reportTimestamp: string;
+  recommendations: string[];
+  fileModifiedSinceLastReport: boolean;
+  hasPastedCode: boolean;
+}
+
+class WorkspaceWatcher {
+  private intervalId: NodeJS.Timeout | null = null;
+  public interval: number;
+  private task: () => void;
+
+  constructor(task: () => void, interval: number) {
+    this.task = task;
+    this.interval = interval;
+  }
+
+  start(): void {
+    if (this.intervalId === null) {
+      this.intervalId = setInterval(() => {
+        this.task();
+      }, this.interval);
+    }
+  }
+
+  stop(): void {
+    if (this.intervalId !== null) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
+    }
+  }
+
+  isRunning(): boolean {
+    return this.intervalId !== null;
+  }
+}
+
+export class SecurityAgent {
   public currentFile: string;
+  public openedFiles: any;
+  private basePlugin: any;
+  private watcher: WorkspaceWatcher;
+  public reports: SecurityReport[] = [];
+
+  constructor(plugin) {
+    this.basePlugin = plugin;
+
+    this.basePlugin.on('fileManager', 'fileAdded', (path) => { });
+    this.basePlugin.on('fileManager', 'fileChanged', (path) => { //this.modifiedFile(path)
+    });
+
+    this.basePlugin.on('fileManager', 'fileRemoved', (path) => { this.removeFileFromReport(path) });
+    this.basePlugin.on('fileManager', 'fileRenamed', (oldName, newName) => {
+      this.removeFileFromReport(oldName);
+      this.addFileToReport(newName);
+    });
+
+    // disable for now the compilationFinished event
+    // this.basePlugin.on('solidity', 'compilationFinished', async (fileName, source, languageVersion, data) => { this.onCompilationFinished(fileName) });
+    // this.basePlugin.on('vyper', 'compilationFinished', async (fileName, source, languageVersion, data) => { this.onCompilationFinished(fileName) });
+    // this.basePlugin.on('hardhat', 'compilationFinished', async (fileName, source, languageVersion, data) => { this.onCompilationFinished(fileName) });
+    // this.basePlugin.on('foundry', 'compilationFinished', async (fileName, source, languageVersion, data) => { this.onCompilationFinished(fileName) });
+
+    this.watcher = new WorkspaceWatcher(async () => {
+      try {
+        this.currentFile = await this.basePlugin.call('fileManager', 'getCurrentFile');
+        this.openedFiles = await this.basePlugin.call('fileManager', 'getOpenedFiles');
+
+        Object.keys(this.openedFiles).forEach(key => {
+          this.addFileToReport(this.openedFiles[key]);
+        });
+      } catch (error) {
+        // no file selected or opened currently
+      }
+    }, 10000);
+    this.watcher.start();
+  }
+
+  addFileToReport(file: string): void {
+    const report = this.reports.find((r) => r.fileName === file);
+    if (report) {
+      // nothing to do
+    } else {
+      this.reports.push({
+        compiled: false,
+        isNotSafe: 'No',
+        vulnerabilities: [],
+        fileName: file,
+        reportTimestamp: null,
+        recommendations: [],
+        fileModifiedSinceLastReport: false,
+        hasPastedCode: false
+      });
+    }
 
-  constructor(codebasePath: string) {
-    // git or fs
-    this.codebase = this.loadCodebase(codebasePath);
   }
 
-  private loadCodebase(path: string): string[] {
-    const files = fs.readdirSync(path);
-    return files
-      .filter(file => file.endsWith('.ts'))
-      .flatMap(file => fs.readFileSync(`${path}/${file}`, 'utf-8').split('\n'));
+  async onCompilationFinished(file: string) {
+    let report = this.reports.find((r) => r.fileName === file);
+    if (report) {
+      report.compiled = true;
+      report.fileModifiedSinceLastReport = false;
+    } else {
+      report = {
+        compiled: true,
+        isNotSafe: 'No',
+        vulnerabilities: [],
+        fileName: file,
+        reportTimestamp: null,
+        recommendations: [],
+        fileModifiedSinceLastReport: false,
+        hasPastedCode: false
+      }
+      this.reports.push(report);
+    }
+
+    try {
+      this.processFile(file);
+      console.log('Checking for vulnerabilities after compilation', this.reports);
+    } catch (error) {
+      console.error('Error checking for vulnerabilities after compilation: ', error);
+    }
+
+    // check for security vulnerabilities
   }
 
-  public update(currentFile, lineNumber){
+  removeFileFromReport(file: string): void {
+    const index = this.reports.findIndex((r) => r.fileName === file);
+    if (index !== -1) {
+      this.reports.splice(index, 1);
+    }
+  }
+
+  modifiedFile(file: string): void {
+    const report = this.reports.find((r) => r.fileName === file);
+    if (report) {
+      report.fileModifiedSinceLastReport = true;
+    }
+  }
+
+  async processFile(file: string) {
+    try {
+      const report = this.reports.find((r) => r.fileName === file);
+      if (report) { }
+      else {
+        this.reports.push({
+          compiled: false,
+          isNotSafe: 'No',
+          vulnerabilities: [],
+          fileName: file,
+          reportTimestamp: null,
+          recommendations: [],
+          fileModifiedSinceLastReport: false,
+          hasPastedCode: false
+        });
+      }
+
+      if (!report.reportTimestamp || report.fileModifiedSinceLastReport) {
+        const content = await this.basePlugin.call('fileManager', 'getFile', file);
+        const prompt = "```\n" + content + "\n```\n\nReply in a short manner: Does this code contain major security vulnerabilities leading to a scam or loss of funds?"
+
+        let result = await this.basePlugin.call('remixAI', 'vulnerability_check', prompt)
+        result = JSON.parse(result);
+        report.vulnerabilities = result.Reason;
+        report.recommendations = result.Suggestion;
+        report.isNotSafe = result.Answer;
+        report.reportTimestamp = new Date().toISOString();
+      }
+
+    } catch (error) {
+      console.error('Error processing file: ', error);
+    }
+  }
 
+  getReport(file: string): SecurityReport {
+    return this.reports.find((r) => r.fileName === file);
   }
 
   public getRecommendations(currentLine: string, numSuggestions: number = 3): string[] {
-    // process the codebase highlighting security vulnerabilities and deliver recommendations
     const suggestions: string[] = [];
     return suggestions;
   }
diff --git a/libs/remix-ai-core/src/helpers/streamHandler.ts b/libs/remix-ai-core/src/helpers/streamHandler.ts
index 9eb5511861..5d58519568 100644
--- a/libs/remix-ai-core/src/helpers/streamHandler.ts
+++ b/libs/remix-ai-core/src/helpers/streamHandler.ts
@@ -46,6 +46,7 @@ export const HandleStreamResponse = async (streamResponse,
       }
       catch (error) {
         console.error('Error parsing JSON:', error);
+        return { 'generateText': 'Try again!', 'isGenerating': false }
       }
     }
     if (done_cb) {
@@ -54,10 +55,10 @@ export const HandleStreamResponse = async (streamResponse,
   }
   catch (error) {
     console.error('Error parsing JSON:', error);
-    return { 'generateText': '', 'isGenerating': false }
+    return { 'generateText': 'Try again!', 'isGenerating': false }
   }
 }
 
-export const UpdtateChatHistory = (userPromptprompt: string, AIAnswer: string) => {
-  ChatHistory.pushHistory(userPromptprompt, AIAnswer)
-}
\ No newline at end of file
+export const UpdateChatHistory = (userPrompt: string, AIAnswer: string) => {
+  ChatHistory.pushHistory(userPrompt, AIAnswer)
+}
diff --git a/libs/remix-ai-core/src/index.ts b/libs/remix-ai-core/src/index.ts
index fe54a57f2f..130f040c48 100644
--- a/libs/remix-ai-core/src/index.ts
+++ b/libs/remix-ai-core/src/index.ts
@@ -6,7 +6,7 @@ import { IModel, IModelResponse, IModelRequest, InferenceModel, ICompletions,
 import { ModelType } from './types/constants'
 import { DefaultModels, InsertionParams, CompletionParams, GenerationParams } from './types/models'
 import { getCompletionPrompt, getInsertionPrompt } from './prompts/completionPrompts'
-import { buildSolgptPromt, PromptBuilder } from './prompts/promptBuilder'
+import { buildSolgptPrompt, PromptBuilder } from './prompts/promptBuilder'
 import { RemoteInferencer } from './inferencers/remote/remoteInference'
 import { ChatHistory } from './prompts/chat'
 import { downloadLatestReleaseExecutable } from './helpers/inferenceServerReleases'
@@ -14,11 +14,12 @@ import { downloadLatestReleaseExecutable } from './helpers/inferenceServerReleas
 export {
   IModel, IModelResponse, IModelRequest, InferenceModel,
   ModelType, DefaultModels, ICompletions, IParams, IRemoteModel,
-  getCompletionPrompt, getInsertionPrompt, IStreamResponse, buildSolgptPromt,
+  getCompletionPrompt, getInsertionPrompt, IStreamResponse, buildSolgptPrompt,
   RemoteInferencer, InsertionParams, CompletionParams, GenerationParams,
   ChatEntry, AIRequestType, RemoteBackendOPModel, ChatHistory, downloadLatestReleaseExecutable
 }
 
 export * from './types/types'
 export * from './helpers/streamHandler'
-export * from './agents/codeExplainAgent'
\ No newline at end of file
+export * from './agents/codeExplainAgent'
+export * from './agents/securityAgent'
\ No newline at end of file
diff --git a/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts b/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts
index c6ad381618..dbee3e37ab 100644
--- a/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts
+++ b/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts
@@ -1,6 +1,6 @@
 import { ICompletions, IParams, AIRequestType, RemoteBackendOPModel, JsonStreamParser } from "../../types/types";
 import { GenerationParams, CompletionParams, InsertionParams } from "../../types/models";
-import { buildSolgptPromt } from "../../prompts/promptBuilder";
+import { buildSolgptPrompt } from "../../prompts/promptBuilder";
 import EventEmitter from "events";
 import { ChatHistory } from "../../prompts/chat";
 import axios from 'axios';
@@ -127,7 +127,7 @@ export class RemoteInferencer implements ICompletions {
   }
 
   async solidity_answer(prompt, options:IParams=GenerationParams): Promise<any> {
-    const main_prompt = buildSolgptPromt(prompt, this.model_op)
+    const main_prompt = buildSolgptPrompt(prompt, this.model_op)
     const payload = { 'prompt': main_prompt, "endpoint":"solidity_answer", ...options }
     if (options.stream_result) return this._streamInferenceRequest(payload, AIRequestType.GENERAL)
     else return this._makeRequest(payload, AIRequestType.GENERAL)
diff --git a/libs/remix-ai-core/src/prompts/promptBuilder.ts b/libs/remix-ai-core/src/prompts/promptBuilder.ts
index fea867e36c..e22088bc6a 100644
--- a/libs/remix-ai-core/src/prompts/promptBuilder.ts
+++ b/libs/remix-ai-core/src/prompts/promptBuilder.ts
@@ -7,7 +7,7 @@ export const PromptBuilder = (inst, answr, modelop) => {
   if (modelop === RemoteBackendOPModel.MISTRAL) return ""
 }
 
-export const buildSolgptPromt = (userPrompt:string, modelOP:RemoteBackendOPModel) => {
+export const buildSolgptPrompt = (userPrompt:string, modelOP:RemoteBackendOPModel) => {
   if (modelOP === undefined) {
     console.log('WARNING: modelOP is undefined. Provide a valid model OP for chat history')
     return userPrompt
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index 0910832f0a..9bda03e259 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.71",
+  "version": "0.5.72",
   "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": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-astwalker": "^0.0.92",
-    "@remix-project/remix-lib": "^0.5.69",
+    "@remix-project/remix-astwalker": "^0.0.93",
+    "@remix-project/remix-lib": "^0.5.70",
     "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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
   "main": "./src/index.js"
 }
\ No newline at end of file
diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts
index 017f50e9fa..90c793de89 100644
--- a/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts
+++ b/libs/remix-analyzer/src/solidity-analyzer/modules/functionCallGraph.ts
@@ -33,7 +33,7 @@ function buildLocalFuncCallGraphInternal (functions: FunctionHLAst[], nodeFilter
  *    "functions": {
  *      "KingOfTheEtherThrone.claimThrone(string memory)": {    // function in KingOfEtherThrone
  *        "node": {...},                                        // function node as defined in abstractAstView.js
- *        "calls": {                                            // list of full qualified function names which are called form this function
+ *        "calls": {                                            // list of full qualified function names which are called from this function
  *        }
  *      }
  *    }
diff --git a/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts b/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts
index 10a4a1761a..c806e3ec1b 100644
--- a/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts
+++ b/libs/remix-analyzer/src/solidity-analyzer/modules/staticAnalysisCommon.ts
@@ -179,7 +179,7 @@ function getFunctionCallType (func: FunctionCallAstNode): string {
 }
 
 /**
- * Get the variable name written to by a effect node, except for inline assembly because there is no information to find out where we write to. Trows if not a effect node or is inlineassmbly.
+ * Get the variable name written to by a effect node, except for inline assembly because there is no information to find out where we write to. Throws if not a effect node or is inline assembly.
  * Example: x = 10; => x
  * @effectNode {ASTNode} Assignment node
  * @return {string} variable name written to
@@ -409,7 +409,7 @@ function getLibraryCallContractName (node: FunctionCallAstNode): string | undefi
  *  library set{...}
  *  contract foo {
  *    ...
- *    function () { set.union() => uinion}
+ *    function () { set.union() => union}
  * @func {ASTNode} function call node
  * @return {string} name of function called on the library
  */
@@ -1040,7 +1040,7 @@ function matches (...fnArgs: any[]): string {
 
 /**
  * Finds first node of a certain type under a specific node.
- * @node {AstNode} node to start form
+ * @node {AstNode} node to start from
  * @type {String} Type the ast node should have
  * @return {AstNode} null or node found
  * Note: developed keeping identifier node search in mind to get first identifier node from left in subscope
diff --git a/libs/remix-api/src/lib/plugins/remixAIDesktop-api.ts b/libs/remix-api/src/lib/plugins/remixAIDesktop-api.ts
index 91b13c4bac..9e4cdd4716 100644
--- a/libs/remix-api/src/lib/plugins/remixAIDesktop-api.ts
+++ b/libs/remix-api/src/lib/plugins/remixAIDesktop-api.ts
@@ -10,7 +10,7 @@ export interface IRemixAID {
 
   } & StatusEvents,
   methods: {
-    code_completion(context: string): Promise<string> 
+    code_completion(context: string): Promise<string>
     code_insertion(msg_pfx: string, msg_sfx: string): Promise<string>,
     code_generation(prompt: string): Promise<string | null>,
     code_explaining(code: string, context?: string): Promise<string | null>,
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index 9382a9003d..9d24820510 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.92",
+  "version": "0.0.93",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -37,7 +37,7 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.69",
+    "@remix-project/remix-lib": "^0.5.70",
     "@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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-astwalker/src/sourceMappings.ts b/libs/remix-astwalker/src/sourceMappings.ts
index 69b279d608..70c6c5b90e 100644
--- a/libs/remix-astwalker/src/sourceMappings.ts
+++ b/libs/remix-astwalker/src/sourceMappings.ts
@@ -8,7 +8,7 @@ export declare interface SourceMappings {
 }
 
 /**
- * Turn an character offset into a "LineColPosition".
+ * Turn a character offset into a "LineColPosition".
  *
  * @param offset  The character offset to convert.
  */
diff --git a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
index ec5e5e57fb..258ee64cb3 100644
--- a/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
+++ b/libs/remix-core-plugin/src/lib/compiler-artefacts.ts
@@ -101,7 +101,7 @@ export class CompilerArtefacts extends Plugin {
    * Get a particular contract output/artefacts from a compiler output of a Solidity file compilation
    * @param compilerOutput compiler output
    * @param contractName contract name
-   * @returns arefacts object, with fully qualified name (e.g; contracts/1_Storage.sol:Storage) as key
+   * @returns artefacts object, with fully qualified name (e.g; contracts/1_Storage.sol:Storage) as key
    */
   _getAllContractArtefactsfromOutput(compilerOutput, contractName) {
     const contractArtefacts = {}
diff --git a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
index 5f16219aa8..a2a50662a6 100644
--- a/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
+++ b/libs/remix-core-plugin/src/lib/openzeppelin-proxy.ts
@@ -19,7 +19,7 @@ export class OpenZeppelinProxy extends Plugin {
   }
 
   async isConcerned(ast: ContractAST = {} as ContractAST): Promise<boolean> {
-    // check in the AST if it's an upgradable contract
+    // check in the AST if it's an upgradeable contract
     const UUPSSymbol = ast.exportedSymbols && ast.exportedSymbols[UUPS] ? ast.exportedSymbols[UUPS][0] : null
 
     if (UUPSSymbol) {
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index 2c385f3ec3..7dc8e0c507 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.62",
+  "version": "0.5.63",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -26,10 +26,10 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-astwalker": "^0.0.92",
-    "@remix-project/remix-lib": "^0.5.69",
-    "@remix-project/remix-simulator": "^0.2.62",
-    "@remix-project/remix-solidity": "^0.5.48",
+    "@remix-project/remix-astwalker": "^0.0.93",
+    "@remix-project/remix-lib": "^0.5.70",
+    "@remix-project/remix-simulator": "^0.2.63",
+    "@remix-project/remix-solidity": "^0.5.49",
     "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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/src/code/codeManager.ts b/libs/remix-debug/src/code/codeManager.ts
index 84e96fa8a3..1c8b4eacd7 100644
--- a/libs/remix-debug/src/code/codeManager.ts
+++ b/libs/remix-debug/src/code/codeManager.ts
@@ -134,25 +134,25 @@ export class CodeManager {
     return findNodeAtInstructionIndex('FunctionDefinition', instIndex, sourceMap, ast)
   }
 
-  private retrieveCodeAndTrigger (codeMananger, address, stepIndex, tx) {
-    codeMananger.getCode(address).then((result) => {
-      this.retrieveIndexAndTrigger(codeMananger, address, stepIndex, result.instructions)
+  private retrieveCodeAndTrigger (codeManager, address, stepIndex, tx) {
+    codeManager.getCode(address).then((result) => {
+      this.retrieveIndexAndTrigger(codeManager, address, stepIndex, result.instructions)
     }).catch((error) => {
       return console.log(error)
     })
   }
 
-  private async retrieveIndexAndTrigger (codeMananger, address, step, code) {
+  private async retrieveIndexAndTrigger (codeManager, address, step, code) {
     let result
     const next = []
     const returnInstructionIndexes = []
     const outOfGasInstructionIndexes = []
 
     try {
-      result = codeMananger.getInstructionIndex(address, step)
+      result = codeManager.getInstructionIndex(address, step)
       for (let i = 1; i < 6; i++) {
         if (this.traceManager.inRange(step + i)) {
-          next.push(codeMananger.getInstructionIndex(address, step + i))
+          next.push(codeManager.getInstructionIndex(address, step + i))
         }
       }
 
@@ -177,7 +177,7 @@ export class CodeManager {
       return console.log(error)
     }
     try {
-      codeMananger.event.trigger('changed', [code, address, result, next, returnInstructionIndexes, outOfGasInstructionIndexes])
+      codeManager.event.trigger('changed', [code, address, result, next, returnInstructionIndexes, outOfGasInstructionIndexes])
     } catch (e) {
       console.log('dispatching event failed', e)
     }
diff --git a/libs/remix-debug/src/solidity-decoder/types/util.ts b/libs/remix-debug/src/solidity-decoder/types/util.ts
index a8d78b3acd..aec2849227 100644
--- a/libs/remix-debug/src/solidity-decoder/types/util.ts
+++ b/libs/remix-debug/src/solidity-decoder/types/util.ts
@@ -38,7 +38,7 @@ export function extractHexByteSlice (slotValue, byteLength, offsetFromLSB) {
 }
 
 /**
- * @returns a hex encoded storage content at the given @arg location. it does not have Ox prefix but always has the full length.
+ * @returns a hex encoded storage content at the given @arg location. it does not have 0x prefix but always has the full length.
  *
  * @param {Object} location  - object containing the slot and offset of the data to extract.
  * @param {Object} storageResolver  - storage resolver
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 101fef7923..6a0e2b3484 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.69",
+  "version": "0.5.70",
   "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": "baa8abc9b912288b7a2546bedc717a9229f652c4",
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-lib/src/execution/logsManager.ts b/libs/remix-lib/src/execution/logsManager.ts
index 65914215b4..0beefd5b64 100644
--- a/libs/remix-lib/src/execution/logsManager.ts
+++ b/libs/remix-lib/src/execution/logsManager.ts
@@ -52,7 +52,21 @@ export class LogsManager {
   }
 
   eventMatchesFilter (changeEvent, queryType, queryFilter) {
-    if (queryFilter.topics.filter((logTopic) => changeEvent.log.topics.indexOf(logTopic) >= 0).length === 0) return false
+    // topics should match
+    let noMatch = false
+    for (let i = 0; i < queryFilter.topics.length; i++) {
+      if (!queryFilter.topics[i]) {
+        continue // if the topic isn't defined, we consider it a match.
+      }
+      if (Array.isArray(queryFilter.topics[i])) {
+        if (queryFilter.topics[i].indexOf(changeEvent.log.topics[i]) === -1) {
+          noMatch = true
+        }
+        continue
+      }
+      if (queryFilter.topics[i] !== changeEvent.log.topics[i]) noMatch = true
+    }
+    if (noMatch) return false
 
     if (queryType === 'logs') {
       const fromBlock = parseInt(queryFilter.fromBlock || '0x0')
diff --git a/libs/remix-lib/src/execution/txHelper.ts b/libs/remix-lib/src/execution/txHelper.ts
index 42a4333ef3..7cd9ab7393 100644
--- a/libs/remix-lib/src/execution/txHelper.ts
+++ b/libs/remix-lib/src/execution/txHelper.ts
@@ -47,7 +47,7 @@ export function sortAbiFunction (contractabi) {
   // Check if function is constant (introduced with Solidity 0.6.0)
   const isConstant = ({ stateMutability }) => stateMutability === 'view' || stateMutability === 'pure'
   // Sorts the list of ABI entries. Constant functions will appear first,
-  // followed by non-constant functions. Within those t wo groupings, functions
+  // followed by non-constant functions. Within those two groupings, functions
   // will be sorted by their names.
   return contractabi.sort(function (a, b) {
     if (isConstant(a) && !isConstant(b)) {
diff --git a/libs/remix-lib/src/execution/txRunner.ts b/libs/remix-lib/src/execution/txRunner.ts
index ee2ee5ed2d..e875ff6713 100644
--- a/libs/remix-lib/src/execution/txRunner.ts
+++ b/libs/remix-lib/src/execution/txRunner.ts
@@ -16,7 +16,7 @@ export type Transaction = {
 export class TxRunner {
   event
   pendingTxs
-  queusTxs
+  queueTxs
   opt
   internalRunner
   constructor (internalRunner, opt) {
@@ -25,7 +25,7 @@ export class TxRunner {
     this.event = new EventManager()
 
     this.pendingTxs = {}
-    this.queusTxs = []
+    this.queueTxs = []
   }
 
   rawRun (args: Transaction, confirmationCb, gasEstimationForceSend, promptCb, cb) {
@@ -42,14 +42,14 @@ export class TxRunner {
 
 function run (self, tx: Transaction, stamp, confirmationCb, gasEstimationForceSend = null, promptCb = null, callback = null) {
   if (Object.keys(self.pendingTxs).length) {
-    return self.queusTxs.push({ tx, stamp, confirmationCb, gasEstimationForceSend, promptCb, callback })
+    return self.queueTxs.push({ tx, stamp, confirmationCb, gasEstimationForceSend, promptCb, callback })
   }
   self.pendingTxs[stamp] = tx
   self.execute(tx, confirmationCb, gasEstimationForceSend, promptCb, function (error, result) {
     delete self.pendingTxs[stamp]
     if (callback && typeof callback === 'function') callback(error, result)
-    if (self.queusTxs.length) {
-      const next = self.queusTxs.pop()
+    if (self.queueTxs.length) {
+      const next = self.queueTxs.pop()
       run(self, next.tx, next.stamp, next.confirmationCb, next.gasEstimationForceSend, next.promptCb, next.callback)
     }
   })
diff --git a/libs/remix-lib/src/execution/txRunnerVM.ts b/libs/remix-lib/src/execution/txRunnerVM.ts
index 6c4c40b27b..f326c9dc8e 100644
--- a/libs/remix-lib/src/execution/txRunnerVM.ts
+++ b/libs/remix-lib/src/execution/txRunnerVM.ts
@@ -24,7 +24,7 @@ export class TxRunnerVM {
   blockNumber
   pendingTxs
   vmaccounts
-  queusTxs
+  queueTxs
   blocks: Uint8Array[]
   logsManager
   commonContext
@@ -41,7 +41,7 @@ export class TxRunnerVM {
     this.commonContext = this.getVMObject().common
     this.pendingTxs = {}
     this.vmaccounts = vmaccounts
-    this.queusTxs = []
+    this.queueTxs = []
     /*
       txHash is generated using the nonce,
       in order to have unique transaction hash, we need to keep using different nonce (in case of a call)
@@ -75,6 +75,33 @@ export class TxRunnerVM {
     }
   }
 
+  runEmptyBlock (callback: VMExecutionCallBack) {
+    const EIP1559 = this.commonContext.hardfork() !== 'berlin' // berlin is the only pre eip1559 fork that we handle.
+    const coinbases = ['0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', '0x8945a1288dc78a6d8952a92c77aee6730b414778', '0x94d76e24f818426ae84aa404140e8d5f60e10e7e']
+    const difficulties = [69762765929000, 70762765929000, 71762765929000]
+    const difficulty = this.commonContext.consensusType() === ConsensusType.ProofOfStake ? 0 : difficulties[this.blocks.length % difficulties.length]
+    const block = Block.fromBlockData({
+      header: {
+        timestamp: new Date().getTime() / 1000 | 0,
+        number: this.blocks.length,
+        coinbase: coinbases[this.blocks.length % coinbases.length],
+        difficulty,
+        gasLimit: 0,
+        baseFeePerGas: EIP1559 ? '0x1' : undefined,
+        parentHash: this.blockParentHash
+      }
+    }, { common: this.commonContext })
+
+    this.blockParentHash = block.hash()
+    this.runBlockInVm(null, block, async (err, result) => {
+      if (!err) {
+        this.getVMObject().vm.blockchain.putBlock(block)
+        this.blocks.push(block.serialize())
+      }
+      callback(err, result)
+    })
+  }
+
   async runInVm (tx: InternalTransaction, callback: VMExecutionCallBack) {
     const { to, data, value, gasLimit, useCall, signed } = tx
     let { from } = tx
@@ -183,7 +210,7 @@ export class TxRunnerVM {
       const result: RunTxResult = results.results[0]
       callback(null, {
         result,
-        transactionHash: bytesToHex(Buffer.from(tx.hash())),
+        transactionHash: tx ? bytesToHex(Buffer.from(tx.hash())) : null,
         block,
         tx
       })
diff --git a/libs/remix-lib/src/hash.ts b/libs/remix-lib/src/hash.ts
index f1f00eed55..5e79f49ba7 100644
--- a/libs/remix-lib/src/hash.ts
+++ b/libs/remix-lib/src/hash.ts
@@ -37,7 +37,7 @@ export const keccak256 = function(a: Buffer): Uint8Array {
 }
 
 /**
- * Creates Keccak hash of a utf-8 string input
+ * Creates Keccak hash of an utf-8 string input
  * @param a The input data (String)
  * @param bits (number = 256) The Keccak width
  */
diff --git a/libs/remix-simulator/README.md b/libs/remix-simulator/README.md
index 8410dd63f0..4c3717fefc 100644
--- a/libs/remix-simulator/README.md
+++ b/libs/remix-simulator/README.md
@@ -5,7 +5,7 @@
 [![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator)
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/ethereum/remix-project/issues)
 
-`@remix-project/remix-simulator` is a web3 wrapper for different kind of providers. It is used in `remix-tests` library and in Remix IDE codebase.
+`@remix-project/remix-simulator` is a web3 wrapper for different kinds of providers. It is used in `remix-tests` library and in Remix IDE codebase.
 
 ### Installation
 `@remix-project/remix-simulator` is an NPM package and can be installed using NPM as:
@@ -39,7 +39,7 @@
 * [X] eth_getCode
 * [~] eth_sign
 * [X] eth_sendTransaction
-* [_] eth_sendRawTransaction
+* [x] eth_sendRawTransaction
 * [X] eth_call
 * [~] eth_estimateGas
 * [X] eth_getBlockByHash
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index 6151383671..e1ce6bfc72 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.62",
+  "version": "0.2.63",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -23,7 +23,7 @@
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
     "@metamask/eth-sig-util": "^7.0.2",
-    "@remix-project/remix-lib": "^0.5.69",
+    "@remix-project/remix-lib": "^0.5.70",
     "ansi-gray": "^0.1.1",
     "async": "^3.1.0",
     "body-parser": "^1.18.2",
@@ -71,6 +71,6 @@
   },
   "homepage": "https://github.com/ethereum/remix-project/tree/master/libs/remix-simulator#readme",
   "typings": "src/index.d.ts",
-  "gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4",
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-simulator/src/methods/accounts.ts b/libs/remix-simulator/src/methods/accounts.ts
index c28818c8e6..c35e7f46a6 100644
--- a/libs/remix-simulator/src/methods/accounts.ts
+++ b/libs/remix-simulator/src/methods/accounts.ts
@@ -1,7 +1,7 @@
 import { signTypedData, SignTypedDataVersion, TypedMessage, MessageTypes } from '@metamask/eth-sig-util'
 import { privateToAddress, toChecksumAddress, isValidPrivate, Address, toBytes, bytesToHex, Account } from '@ethereumjs/util'
 import { privateKeyToAccount } from 'web3-eth-accounts'
-import { toBigInt } from 'web3-utils'
+import { toBigInt, toHex } from 'web3-utils'
 import * as crypto from 'crypto'
 
 type AccountType = {
@@ -13,9 +13,11 @@ export class Web3Accounts {
   accounts: Record<string, AccountType>
   accountsKeys: Record<string, string>
   vmContext
+  options
 
-  constructor (vmContext) {
+  constructor (vmContext, options) {
     this.vmContext = vmContext
+    this.options = options
     // TODO: make it random and/or use remix-libs
 
     this.accounts = {}
@@ -97,6 +99,8 @@ export class Web3Accounts {
   eth_getBalance (payload, cb) {
     const address = payload.params[0]
     this.vmContext.vm().stateManager.getAccount(Address.fromString(address)).then((account) => {
+      if (!account) return cb(null, toBigInt(0).toString(10))
+      if (!account.balance) return cb(null, toBigInt(0).toString(10))
       cb(null, toBigInt(account.balance).toString(10))
     }).catch((error) => {
       cb(error)
@@ -119,7 +123,9 @@ export class Web3Accounts {
   }
 
   eth_chainId (_payload, cb) {
-    return cb(null, '0x539') // 0x539 is hex of 1337
+    if (!this.options.chainId) return cb(null, '0x539') // 0x539 is hex of 1337
+    const id = (typeof this.options.chainId === 'number') ? toHex(this.options.chainId) : this.options.chainId
+    return cb(null, id)
   }
 
   eth_signTypedData_v4 (payload, cb) {
diff --git a/libs/remix-simulator/src/methods/evm.ts b/libs/remix-simulator/src/methods/evm.ts
new file mode 100644
index 0000000000..16fde3c180
--- /dev/null
+++ b/libs/remix-simulator/src/methods/evm.ts
@@ -0,0 +1,79 @@
+import { Block } from '@ethereumjs/block'
+import { ConsensusType } from '@ethereumjs/common'
+import type { VMContext } from '../vm-context'
+import type { Transactions } from '../methods/transactions'
+
+export class EVM {
+  vmContext: VMContext
+  transactions: Transactions
+
+  constructor (vmContext: VMContext, transactions: Transactions) {
+    this.vmContext = vmContext
+    this.transactions = transactions
+  }
+
+  methods () {
+    return {
+      evm_setAutomine: this.evm_setAutomine.bind(this),
+      evm_setIntervalMining: this.evm_setIntervalMining.bind(this),
+      evm_snapshot: this.evm_snapshot.bind(this),
+      evm_revert: this.evm_revert.bind(this),
+      evm_increaseTime: this.evm_increaseTime.bind(this),
+      evm_setNextBlockTimestamp: this.evm_setNextBlockTimestamp.bind(this),
+      evm_setBlockGasLimit: this.evm_setBlockGasLimit.bind(this),
+      evm_mine: this.evm_mine.bind(this)
+    }
+  }
+
+  evm_setAutomine (payload, cb) {
+    // always on
+    cb()
+  }
+
+  evm_setIntervalMining (payload, cb) {
+    cb()
+  }
+
+  evm_snapshot (payload, cb) {
+    cb()
+  }
+
+  evm_revert (payload, cb) {
+    cb()
+  }
+
+  evm_increaseTime (payload, cb) {
+    cb()
+  }
+
+  evm_setNextBlockTimestamp (payload, cb) {
+    cb()
+  }
+
+  evm_setBlockGasLimit (payload, cb) {
+    cb()
+  }
+
+  async evm_mine (payload, cb) {
+    const runEmptyBlock = () => {
+      return new Promise((resolve, reject) => {
+        this.transactions.txRunnerVMInstance.runEmptyBlock((error, result) => {
+          if (error) {
+            reject(error)
+            return
+          }
+          this.vmContext.addBlock(result.block, false, true)
+          resolve(result)
+        })
+      })
+    }
+
+    const blocks = payload.params[0].blocks
+
+    for (let b = 0; b < Number(blocks); b++) {
+      await runEmptyBlock()
+      console.log('mining...', b, this.vmContext.latestBlockNumber)
+    }
+    cb()
+  }
+}
diff --git a/libs/remix-simulator/src/methods/miner.ts b/libs/remix-simulator/src/methods/miner.ts
new file mode 100644
index 0000000000..b44058f5a7
--- /dev/null
+++ b/libs/remix-simulator/src/methods/miner.ts
@@ -0,0 +1,18 @@
+export class Miner {
+  vmContext
+
+  constructor (vmContext) {
+    this.vmContext = vmContext
+  }
+
+  methods () {
+    return {
+      miner_start: this.miner_start.bind(this),
+      miner_stop: this.miner_stop.bind(this)
+    }
+  }
+
+  miner_start (payload, cb) { cb() }
+
+  miner_stop (payload, cb) { cb() }
+}
diff --git a/libs/remix-simulator/src/methods/net.ts b/libs/remix-simulator/src/methods/net.ts
index 1a064719f4..3c9c7a612c 100644
--- a/libs/remix-simulator/src/methods/net.ts
+++ b/libs/remix-simulator/src/methods/net.ts
@@ -1,20 +1,24 @@
-export function methods (): Record<string, unknown> {
-  return {
-    net_version: net_version,
-    net_listening: net_listening,
-    net_peerCount: net_peerCount
+export class Net {
+  vmContext
+  options
+
+  constructor (vmContext, options) {
+    this.vmContext = vmContext
+    this.options = options
   }
-}
 
-export function net_version (payload, cb): void {
-  // should be configured networkId
-  cb(null, 1337)
-}
+  methods () {
+    return {
+      net_version: this.net_version.bind(this),
+      net_listening: this.net_listening.bind(this),
+      net_peerCount: this.net_peerCount.bind(this)
+    }
+  }
 
-export function net_listening (payload, cb): void {
-  cb(null, true)
-}
+  net_version (payload, cb) { cb(null, 1337) }
+
+  net_listening (payload, cb) { cb(null, true)}
 
-export function net_peerCount (payload, cb): void {
-  cb(null, 0)
+  net_peerCount (payload, cb) { cb(null, 0)}
 }
+
diff --git a/libs/remix-simulator/src/provider.ts b/libs/remix-simulator/src/provider.ts
index b6c52345fe..a9be59dacb 100644
--- a/libs/remix-simulator/src/provider.ts
+++ b/libs/remix-simulator/src/provider.ts
@@ -6,9 +6,11 @@ import merge from 'merge'
 import { Web3Accounts } from './methods/accounts'
 import { Filters } from './methods/filters'
 import { methods as miscMethods } from './methods/misc'
-import { methods as netMethods } from './methods/net'
+import { Net } from './methods/net'
 import { Transactions } from './methods/transactions'
+import { Miner } from './methods/miner'
 import { Debug } from './methods/debug'
+import { EVM } from './methods/evm'
 import { VMContext } from './vm-context'
 import { Web3PluginBase } from 'web3'
 
@@ -30,6 +32,7 @@ export type JSONRPCResponseCallback = (err: Error, result?: JSONRPCResponsePaylo
 export type State = Record<string, string>
 
 export type ProviderOptions = {
+  chainId?: number
   fork?: string,
   nodeUrl?: string,
   blockNumber?: number | 'latest',
@@ -47,6 +50,7 @@ export class Provider {
   methods
   connected: boolean
   initialized: boolean
+  initializing: boolean
   pendingRequests: Array<any>
 
   constructor (options: ProviderOptions = {} as ProviderOptions) {
@@ -54,7 +58,7 @@ export class Provider {
     this.connected = true
     this.vmContext = new VMContext(options['fork'], options['nodeUrl'], options['blockNumber'], options['stateDb'], options['blocks'])
 
-    this.Accounts = new Web3Accounts(this.vmContext)
+    this.Accounts = new Web3Accounts(this.vmContext, options)
     this.Transactions = new Transactions(this.vmContext)
 
     this.methods = {}
@@ -62,12 +66,15 @@ export class Provider {
     this.methods = merge(this.methods, (new Blocks(this.vmContext, options)).methods())
     this.methods = merge(this.methods, miscMethods())
     this.methods = merge(this.methods, (new Filters(this.vmContext)).methods())
-    this.methods = merge(this.methods, netMethods())
+    this.methods = merge(this.methods, (new Net(this.vmContext, options)).methods())
     this.methods = merge(this.methods, this.Transactions.methods())
     this.methods = merge(this.methods, (new Debug(this.vmContext)).methods())
+    this.methods = merge(this.methods, (new EVM(this.vmContext, this.Transactions)).methods())
+    this.methods = merge(this.methods, (new Miner(this.vmContext)).methods())
   }
 
   async init () {
+    this.initializing = true
     this.initialized = false
     this.pendingRequests = []
     await this.vmContext.init()
@@ -80,6 +87,7 @@ export class Provider {
       })
       this.pendingRequests = []
     }
+    this.initializing = false
   }
 
   _send(payload: JSONRPCRequestPayload, callback: (err: Error, result?: JSONRPCResponsePayload) => void) {
diff --git a/libs/remix-simulator/test/blocks.ts b/libs/remix-simulator/test/blocks.ts
index e0eb39d6c9..0b4b2ad52c 100644
--- a/libs/remix-simulator/test/blocks.ts
+++ b/libs/remix-simulator/test/blocks.ts
@@ -63,6 +63,17 @@ describe('blocks', () => {
     })
   })
 
+  describe('evm_mine', () => {
+    it('should mine empty block using evm_mine', async function () {
+      await web3.provider.request({
+        method: 'evm_mine',
+        params: [{ blocks: 3 }],
+      })
+      const number = await web3.eth.getBlockNumber()
+      assert.equal(number, 3)
+    })
+  })
+
   describe('eth_getBlockByHash', () => {
     it('should get block given its hash', async () => {
       const correctBlock = await web3.eth.getBlock(0)
diff --git a/libs/remix-simulator/test/events.ts b/libs/remix-simulator/test/events.ts
index cd465caaf3..aa0e0b77fc 100644
--- a/libs/remix-simulator/test/events.ts
+++ b/libs/remix-simulator/test/events.ts
@@ -38,14 +38,14 @@ describe('Events', () => {
         address: receiptTest.contractAddress,
         fromBlock: 3,
         toBlock: 'latest',
-        topics: ['0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc', '0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
+        topics: ['0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
       })
 
       let ownerLogs = await web3.eth.getPastLogs({
         address: receiptOwner.contractAddress,
         fromBlock: 3,
         toBlock: 'latest',
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
 
       // this should include the event triggered by the "set" transaction call.
@@ -56,7 +56,7 @@ describe('Events', () => {
         address: receiptOwner.contractAddress,
         fromBlock: 2,
         toBlock: 'latest',
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
       // this should include the event triggered from the ctor.
       assert.equal(ownerLogs.length, 2, '3) ownerLogs length should be equal to 2')
@@ -65,10 +65,19 @@ describe('Events', () => {
         address: receiptOwner.contractAddress,
         fromBlock: 1,
         toBlock: 2,
-        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']
+        topics: ['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735']
       })
       // this should only include the event triggered from the ctor.
       assert.equal(ownerLogs.length, 1, '4) ownerLogs length should be equal to 1')
+
+      ownerLogs = await web3.eth.getPastLogs({
+        address: receiptOwner.contractAddress,
+        fromBlock: 1,
+        toBlock: 2,
+        topics: [['0x342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a735', '0xdcd9c7fa0342f01013bd0bf2bec103a81936162dcebd1f0c38b1d4164c17e0fc']]
+      })
+      // 0xdcd9c7fa0342f01013b is a topic from an event emitted by the other contract and should not be take into account.
+      assert.equal(ownerLogs.length, 1, '5) ownerLogs length should be equal to 1')
     })
   })
 })
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index 9f8170c08b..be9838cb9b 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.48",
+  "version": "0.5.49",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -19,7 +19,7 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.69",
+    "@remix-project/remix-lib": "^0.5.70",
     "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": "baa8abc9b912288b7a2546bedc717a9229f652c4"
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
 }
\ No newline at end of file
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index 5c7edc1e42..cab15ebaa0 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.62",
+  "version": "0.2.63",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -41,9 +41,9 @@
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
     "@ethereumjs/vm": "8.1.1",
-    "@remix-project/remix-lib": "^0.5.69",
-    "@remix-project/remix-simulator": "^0.2.62",
-    "@remix-project/remix-solidity": "^0.5.48",
+    "@remix-project/remix-lib": "^0.5.70",
+    "@remix-project/remix-simulator": "^0.2.63",
+    "@remix-project/remix-solidity": "^0.5.49",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -89,5 +89,5 @@
     "@ethereumjs/trie": "6.2.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4"
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
 }
\ 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
index 674d069f1c..5f15022b10 100644
--- a/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts
+++ b/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts
@@ -9,7 +9,7 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
   props: EditorUIProps
   monaco: any
   completionEnabled: boolean
-  task: string
+  task: string = 'code_completion'
   currentCompletion: any
   private lastRequestTime: number = 0;
   private readonly minRequestInterval: number = 200;
@@ -60,13 +60,6 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli
       endColumn: getTextAtLine(model.getLineCount()).length + 1,
     });
 
-    if (!word.endsWith(' ') &&
-      !word.endsWith('.') &&
-      !word.endsWith('"') &&
-      !word.endsWith('(')) {
-      return;
-    }
-
     try {
       const split = word.split('\n')
       if (split.length < 2) return
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 c9f2c37da7..e330efb78a 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect, useReducer } from 'react' // eslint
 import { FormattedMessage, useIntl } from 'react-intl'
 import { isArray } from 'lodash'
 import Editor, { DiffEditor, loader, Monaco } from '@monaco-editor/react'
-import { AlertModal } from '@remix-ui/app'
+import { AppModal } from '@remix-ui/app'
 import { ConsoleLogs, QueryParams } from '@remix-project/remix-lib'
 import { reducerActions, reducerListener, initialState } from './actions/editor'
 import { solidityTokensProvider, solidityLanguageConfig } from './syntaxes/solidity'
@@ -664,11 +664,26 @@ export const EditorUI = (props: EditorUIProps) => {
       }
     })
 
-    editor.onDidPaste((e) => {
+    editor.onDidPaste(async (e) => {
       if (!pasteCodeRef.current && e && e.range && e.range.startLineNumber >= 0 && e.range.endLineNumber >= 0 && e.range.endLineNumber - e.range.startLineNumber > 10) {
-        const modalContent: AlertModal = {
+        // get the file name
+        const pastedCode = editor.getModel().getValueInRange(e.range)
+        const pastedCodePrompt = intl.formatMessage({ id: 'editor.PastedCodeSafety' }, { content:pastedCode })
+
+        const modalContent: AppModal = {
           id: 'newCodePasted',
-          title: intl.formatMessage({ id: 'editor.title1' }),
+          title: "New code pasted",
+          okLabel: 'Ask RemixAI',
+          cancelLabel: 'Close',
+          cancelFn: () => {},
+          okFn: async () => {
+            await props.plugin.call('popupPanel', 'showPopupPanel', true)
+            setTimeout(async () => {
+              props.plugin.call('remixAI', 'chatPipe', 'vulnerability_check', pastedCodePrompt)
+            }, 500)
+            // add matamo event
+            _paq.push(['trackEvent', 'ai', 'remixAI', 'vulnerability_check_pasted_code'])
+          },
           message: (
             <div>
               {' '}
@@ -699,10 +714,9 @@ export const EditorUI = (props: EditorUIProps) => {
                 </div>
               </div>
             </div>
-          ),
+          )
         }
-        props.plugin.call('notification', 'alert', modalContent)
-        pasteCodeRef.current = true
+        props.plugin.call('notification', 'modal', modalContent)
         _paq.push(['trackEvent', 'editor', 'onDidPaste', 'more_than_10_lines'])
       }
     })
diff --git a/libs/remix-ui/editor/src/lib/syntaxes/solidity.ts b/libs/remix-ui/editor/src/lib/syntaxes/solidity.ts
index fda352456e..67da59e597 100644
--- a/libs/remix-ui/editor/src/lib/syntaxes/solidity.ts
+++ b/libs/remix-ui/editor/src/lib/syntaxes/solidity.ts
@@ -1236,7 +1236,7 @@ export const solidityTokensProvider = {
     'abstract',
     'payable',
     'nonpayable',
-    'constants',
+    'constant',
     'immutable',
     'assert',
     'require',
diff --git a/libs/remix-ui/editor/src/lib/web-types.ts b/libs/remix-ui/editor/src/lib/web-types.ts
index 4dddad6159..4011cf21be 100644
--- a/libs/remix-ui/editor/src/lib/web-types.ts
+++ b/libs/remix-ui/editor/src/lib/web-types.ts
@@ -115,9 +115,9 @@ export const loadTypes = async (monaco) => {
   monaco.languages.typescript.typescriptDefaults.addExtraLib(ethersSha2Default, `file:///node_modules/@types/@ethersproject_sha2/index.d.ts`)
 
   // @ts-ignore
-  const ethersSingningkey = await import('raw-loader!@ethersproject/signing-key/lib/index.d.ts')
-  const ethersSingningkeyDefault = ethersSingningkey.default.replace(/@ethersproject\//g, '@ethersproject_')
-  monaco.languages.typescript.typescriptDefaults.addExtraLib(ethersSingningkeyDefault, `file:///node_modules/@types/@ethersproject_signing-key/index.d.ts`)
+  const ethersSigningkey = await import('raw-loader!@ethersproject/signing-key/lib/index.d.ts')
+  const ethersSigningkeyDefault = ethersSigningkey.default.replace(/@ethersproject\//g, '@ethersproject_')
+  monaco.languages.typescript.typescriptDefaults.addExtraLib(ethersSigningkeyDefault, `file:///node_modules/@types/@ethersproject_signing-key/index.d.ts`)
 
   // @ts-ignore
   const ethersSolidity = await import('raw-loader!@ethersproject/solidity/lib/index.d.ts')
diff --git a/libs/remix-ui/environment-explorer/src/lib/components/environment-explorer-ui.tsx b/libs/remix-ui/environment-explorer/src/lib/components/environment-explorer-ui.tsx
index a76c319c5b..b4f374276d 100644
--- a/libs/remix-ui/environment-explorer/src/lib/components/environment-explorer-ui.tsx
+++ b/libs/remix-ui/environment-explorer/src/lib/components/environment-explorer-ui.tsx
@@ -15,7 +15,7 @@ const defaultSections: environmentExplorerUIGridSections = {
     title: 'Deploy to an In-browser Virtual Machine.',
     keywords: ['Remix VMs'],
     providers: [],
-    filterFn: (provider) => provider.isVM
+    filterFn: (provider) => provider.isVM && !provider.isForkedVM
   },
   'Forked States': {
     title: 'Deploy to an In-browser Forked State.',
@@ -101,7 +101,20 @@ export const EnvironmentExplorerUI = (props: environmentExplorerUIProps) => {
                     await pinStateCallback(provider, pinned)
                   }}
                 >
-                  <div>{(section.descriptionFn && section.descriptionFn(provider)) || provider.description}</div>
+                  <div data-id={`${provider.name}desc`}>{(section.descriptionFn && section.descriptionFn(provider)) || provider.description}</div>
+                  { provider.isForkedState && <CustomTooltip
+                    placement="auto"
+                    tooltipId={`overlay-tooltip-${provider.name}`}
+                    tooltipText="Delete Environment Immediately"
+                  >
+                    <span
+                      onClick={async () => props.deleteForkedState(provider)}
+                      className="btn btn-sm mt-1 border border-danger"
+                    >
+                          Delete Environment
+                    </span>
+                  </CustomTooltip>
+                  }
                 </RemixUIGridCell>
               ))}
             </RemixUIGridSection>
@@ -110,4 +123,4 @@ export const EnvironmentExplorerUI = (props: environmentExplorerUIProps) => {
       </RemixUIGridView>
     </>
   )
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/environment-explorer/src/lib/types/index.ts b/libs/remix-ui/environment-explorer/src/lib/types/index.ts
index 706e577edd..812a86a6bf 100644
--- a/libs/remix-ui/environment-explorer/src/lib/types/index.ts
+++ b/libs/remix-ui/environment-explorer/src/lib/types/index.ts
@@ -8,6 +8,7 @@ export type environmentExplorerUIProps = {
     providersFlat: { [key: string]: Provider }
     pinnedProviders: string[]
   }
+  deleteForkedState (provider: Provider): Promise<void>
   pinStateCallback (provider: Provider, pinned: boolean): Promise<void>
   profile: Profile
 }
diff --git a/libs/remix-ui/git/src/lib/gitactions.ts b/libs/remix-ui/git/src/lib/gitactions.ts
index 8ab6680988..425c86a3b5 100644
--- a/libs/remix-ui/git/src/lib/gitactions.ts
+++ b/libs/remix-ui/git/src/lib/gitactions.ts
@@ -253,7 +253,7 @@ export const add = async (filepath: addInputType) => {
 
 }
 
-const getLastCommmit = async () => {
+const getLastCommit = async () => {
   try {
     let currentcommitoid = "";
     currentcommitoid = await getCommitFromRef("HEAD");
@@ -275,7 +275,7 @@ export const rm = async (args: rmInputType) => {
 }
 
 export const checkoutfile = async (filename: string) => {
-  const oid = await getLastCommmit();
+  const oid = await getLastCommit();
   if (oid)
     try {
       const commitOid = await plugin.call('dgitApi', 'resolveref', {
@@ -444,7 +444,7 @@ const parseError = async (e: any) => {
       type: ModalTypes.alert
     })
   } else {
-    await sendToMatomo(gitMatomoEventTypes.ERROR, ['UKNOWN'])
+    await sendToMatomo(gitMatomoEventTypes.ERROR, ['UNKNOWN'])
     await plugin.call('notification', 'alert' as any, {
       title: 'Error',
       message: e.message
diff --git a/libs/remix-ui/git/src/lib/listeners.ts b/libs/remix-ui/git/src/lib/listeners.ts
index 028cfa6a7b..6d21729d85 100644
--- a/libs/remix-ui/git/src/lib/listeners.ts
+++ b/libs/remix-ui/git/src/lib/listeners.ts
@@ -36,7 +36,7 @@ class AsyncDebouncedQueue {
   }
 }
 
-export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<gitActionDispatch>, appDispatcher: React.Dispatch<AppAction>, loaderDispatcher: React.Dispatch<any>, setAtivePanel: React.Dispatch<React.SetStateAction<string>>, platform: appPlatformTypes) => {
+export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<gitActionDispatch>, appDispatcher: React.Dispatch<AppAction>, loaderDispatcher: React.Dispatch<any>, setActivePanel: React.Dispatch<React.SetStateAction<string>>, platform: appPlatformTypes) => {
   plugin = viewPlugin
   gitDispatch = gitDispatcher
   loaderDispatch = loaderDispatcher
@@ -200,7 +200,7 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
   })
 
   plugin.on('dgit' as any, 'openPanel', async (panel: string) => {
-    setAtivePanel(panel)
+    setActivePanel(panel)
   })
 
   plugin.on('dgit' as any, 'init', async () => {
diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css
index 3226d3c53f..00454ec7ce 100644
--- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css
+++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.css
@@ -27,9 +27,6 @@
 .remixui_grid_cell_pin {
   width: 1rem;
   height: 1rem;
-  position: relative;
-  right: 0.9rem;
-  top: -0.7rem;
   background: transparent;
   z-index: 1000;
 }
diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx
index 18e9f7af86..d1b0190390 100644
--- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx
+++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx
@@ -86,8 +86,8 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
       { anyEnabled && <div className='mr-2 mt-3 pb-1 d-flex flex-column'>
         <div className='d-flex flex-grid'>
           <div className={ `${pinned ? "" : "border-dark "}` + "d-flex mx-0 p-2 bg-light border border-secondary remixui_grid_cell_container " + props.classList || ''} data-id={"remixUIGS" + props.title}>
-            <div className="d-flex remixui_grid_cell w-100 flex-column">
-              { !props.hideTitle && <div className='d-flex flex-row pb-1 mb-1 align-items-end' style={{ minWidth: '8rem', height: '1rem' }}>
+            <div className="d-flex remixui_grid_cell w-100 space-between justify-content-between flex-column">
+              { !props.hideTitle && <div className='d-flex flex-row pb-1 my-1 align-items-end' style={{ minWidth: '8rem', height: '1rem' }}>
                 { props.logo ? props.logoURL !== '' ?
                   <a href={props.logoURL} target="__blank">
                     <img className='remixui_grid_view_logo mr-1' src={props.logo} style={{ width: '1rem', height: '1rem' }}/>
@@ -103,24 +103,25 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
                     tooltipText={ props.titleTooltip ? props.titleTooltip : props.title }
                   >
                     <label
-                      className='m-0 p-0 text-uppercase align-items-left font-weight-bold text-truncate overflow-hidden whitespace-nowra'
+                      className='m-0 p-0 text-uppercase align-items-left font-weight-bold text-truncate overflow-hidden whitespace-nowrap'
                     >{ props.title }
                     </label>
                   </CustomTooltip>
                 }
               </div> }
               { props.children }
+              { filterCon.showPin && <button
+                className={`${pinned ? 'fas fa-toggle-on fa-lg text-dark' : 'fas fa-toggle-off fa-lg text-secondary'}` + ` fa-regular border-0 p-0 mt-2 align-self-end mr-1 remixui_grid_cell_pin`}
+                style={{ fontSize: 'large' }}
+                data-id={`${pinned ? `${props.id}-pinned` : `${props.id}-unpinned`}`}
+                onClick={async () => {
+                  if (!props.pinStateCallback) setPinned(!pinned)
+                  if (await props.pinStateCallback(!pinned)) setPinned(!pinned)
+                }}
+              ></button>}
             </div>
           </div>
-          { filterCon.showPin && <button
-            className={`${pinned ? 'fa-circle-check text-dark' : 'fa-circle text-secondary'}` + ` fa-regular border-0 mb-0 remixui_grid_cell_pin`}
-            style={{ fontSize: 'large' }}
-            data-id={`${pinned ? `${props.id}-pinned` : `${props.id}-unpinned`}`}
-            onClick={async () => {
-              if (!props.pinStateCallback) setPinned(!pinned)
-              if (await props.pinStateCallback(!pinned)) setPinned(!pinned)
-            }}
-          ></button>}
+
           { props.tagList && <div className={`d-flex flex-column align-items-begin ` +`${filterCon.showPin ? 'remixui_grid_cell_tags' : 'remixui_grid_cell_tags_no_pin'}`}>
             { Object.keys(props.tagList).map((key) => (
               filterCon.keyValueMap[props.tagList[key]]?.enabled && (
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 ba73861806..2c9bbaab34 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
@@ -50,6 +50,40 @@ function HomeTabFeatured(props:HomeTabFeaturedProps) {
               autoPlaySpeed={10000}
               dotListClass="position-relative mt-2"
             >
+              {false && <div // no this is not a mistake. keep it false until next year ;)
+                className="mx-1 px-1 d-flex d-none" // Please do not delete. just comment this out or keep hidden. To be used every year.
+              >
+                <a href="https://cryptpad.fr/form/#/2/form/view/pV-DdryeJoYUWvW+gXsFaMNynEY7t5mUsgeD1urgwSE/" target="__blank">
+                  <img className="remixui_carouselImage" src={'/assets/img/solSurvey2024.webp'} alt=""></img>
+                </a>
+                <div className="h6 w-50 p-2 pl-4  align-self-center" style={{ flex: '1' }}>
+                  <h5>
+                  The Solidity Developer Survey 2024 is live!
+                  </h5>
+                  <p className='pt-2'>
+                    Please take a few minutes of your time to
+                    <a
+                      className="mx-1"
+                      onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'soliditySurvey24'])}
+                      target="__blank"
+                      href="https://cryptpad.fr/form/#/2/form/view/9xjPVmdv8z0Cyyh1ejseMQ0igmx-TedH5CPST3PhRUk/"
+                    >
+                      COMPLETE THE SURVEY.
+                    </a>
+                  </p>
+                  <p style={{ fontSize: '0.8rem' }} className="mb-3">
+                    Thank you for your support! Read the full announcement
+                    <a
+                      className="remixui_home_text mx-1"
+                      onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'soliditySurvey24'])}
+                      target="__blank"
+                      href="https://soliditylang.org/blog/2024/12/27/solidity-developer-survey-2024-announcement/"
+                    >
+                      here.
+                    </a>
+                  </p>
+                </div>
+              </div> }
               <div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
                 <a href={releaseDetails.moreLink} target="__blank">
                   <img src={'assets/img/remi_drums_whatsnew.webp'} className="remixui_carouselImage" alt=""></img>
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 199a141ee7..eb01655998 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
@@ -82,6 +82,11 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
     plugin.verticalIcons.select('solidityUnitTesting')
     _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'solidityUnitTesting'])
   }
+  const startContractVerification = async () => {
+    await plugin.appManager.activatePlugin(['contract-verification'])
+    plugin.verticalIcons.select('contract-verification')
+    _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'contract-verification'])
+  }
 
   return (
     <div className="pl-2 w-100 align-items-end remixui_featuredplugins_container" id="hTFeaturedPlugins">
@@ -116,14 +121,14 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
             itemClass="w-100"
           >
             <PluginButton
-              imgPath="assets/img/staticAnalysis.webp"
-              envID="staticAnalysisLogo"
-              envText="Solidity Analyzers"
+              imgPath="assets/img/contractVerification.webp"
+              envID="contractVerificationLogo"
+              envText="Contract Verification"
               description={intl.formatMessage({
-                id: 'home.codeAnalyizerPluginDesc'
+                id: 'home.contractVerificationDesc',
               })}
-              maintainedBy='Remix'
-              callback={() => startCodeAnalyzer()}
+              maintainedBy="Remix"
+              callback={() => startContractVerification()}
             />
             <PluginButton
               imgPath="assets/img/learnEthLogo.webp"
@@ -135,6 +140,16 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               maintainedBy='Remix'
               callback={() => startLearnEth()}
             />
+            <PluginButton
+              imgPath="assets/img/staticAnalysis.webp"
+              envID="staticAnalysisLogo"
+              envText="Solidity Analyzers"
+              description={intl.formatMessage({
+                id: 'home.codeAnalyizerPluginDesc'
+              })}
+              maintainedBy='Remix'
+              callback={() => startCodeAnalyzer()}
+            />
             <PluginButton
               imgPath="assets/img/cookbook.webp"
               envID="cookbookLogo"
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 4e2d221a3d..81bde5437e 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFile.tsx
@@ -127,7 +127,7 @@ function HomeTabFile({ plugin }: HomeTabFileProps) {
     plugin.verticalIcons.select('filePanel')
   }
 
-  const handleSwichToRecentWorkspace = async (e, workspaceName) => {
+  const handleSwitchToRecentWorkspace = async (e, workspaceName) => {
     e.preventDefault()
     plugin.call('sidePanel', 'showContent', 'filePanel')
     plugin.verticalIcons.select('filePanel')
@@ -146,17 +146,17 @@ function HomeTabFile({ plugin }: HomeTabFileProps) {
                 Recent Workspaces
               </label>
               {state.recentWorkspaces[0] && state.recentWorkspaces[0] !== '' && (
-                <a className="cursor-pointer mb-1 ml-2" href="#" onClick={(e) => handleSwichToRecentWorkspace(e, state.recentWorkspaces[0])}>
+                <a className="cursor-pointer mb-1 ml-2" href="#" onClick={(e) => handleSwitchToRecentWorkspace(e, state.recentWorkspaces[0])}>
                   {state.recentWorkspaces[0]}
                 </a>
               )}
               {state.recentWorkspaces[1] && state.recentWorkspaces[1] !== '' && (
-                <a className="cursor-pointer mb-1 ml-2" href="#" onClick={(e) => handleSwichToRecentWorkspace(e, state.recentWorkspaces[1])}>
+                <a className="cursor-pointer mb-1 ml-2" href="#" onClick={(e) => handleSwitchToRecentWorkspace(e, state.recentWorkspaces[1])}>
                   {state.recentWorkspaces[1]}
                 </a>
               )}
               {state.recentWorkspaces[2] && state.recentWorkspaces[2] !== '' && (
-                <a className="cursor-pointer ml-2" href="#" onClick={(e) => handleSwichToRecentWorkspace(e, state.recentWorkspaces[2])}>
+                <a className="cursor-pointer ml-2" href="#" onClick={(e) => handleSwitchToRecentWorkspace(e, state.recentWorkspaces[2])}>
                   {state.recentWorkspaces[2]}
                 </a>
               )}
diff --git a/libs/remix-ui/home-tab/src/lib/components/types/carouselTypes.ts b/libs/remix-ui/home-tab/src/lib/components/types/carouselTypes.ts
index d65054171d..0f43f1a225 100644
--- a/libs/remix-ui/home-tab/src/lib/components/types/carouselTypes.ts
+++ b/libs/remix-ui/home-tab/src/lib/components/types/carouselTypes.ts
@@ -34,7 +34,7 @@ export interface CarouselProps {
   beforeChange?: (nextSlide: number, state: StateCallBack) => void; // Change callback before sliding every time. `(previousSlide, currentState) => ...`
   sliderClass?: string; // Use this to style your own track list.
   itemClass?: string; // Use this to style your own Carousel item. For example add padding-left and padding-right
-  itemAriaLabel?: string; // Use this to add your own Carousel item aria-label.if it is not defined the child aria label will be applied if the child dont have one than a default empty string will be applied
+  itemAriaLabel?: string; // Use this to add your own Carousel item aria-label.if it is not defined the child aria label will be applied if the child doesn't have one, then a default empty string will be applied
   containerClass?: string; // Use this to style the whole container. For example add padding to allow the "dots" or "arrows" to go to other places without being overflown.
   className?: string; // Use this to style the whole container with styled-components
   dotListClass?: string; // Use this to style the dot list.
diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts
index e7a0b10496..2e16627e8a 100644
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@@ -20,7 +20,7 @@ export class RemixEngine extends Engine {
 export function isNative(name: any): any
 /**
  * Checks if plugin caller 'from' is allowed to activate plugin 'to'
- * The caller can have 'canActivate' as a optional property in the plugin profile.
+ * The caller can have 'canActivate' as an optional property in the plugin profile.
  * This is an array containing the 'name' property of the plugin it wants to call.
  * canActivate = ['plugin1-to-call','plugin2-to-call',....]
  * or the plugin is allowed by default because it is native
@@ -34,14 +34,11 @@ export class RemixAppManager extends PluginManager {
   event: EventEmitter
   pluginsDirectory: string
   pluginLoader: PluginLoader // eslint-disable-line no-use-before-define
-  permissionHandler: PermissionHandler
   getAll(): import('@remixproject/plugin-utils').Profile<any>[]
   getIds(): string[]
   isDependent(name: any): any
   isRequired(name: any): any
   registeredPlugins(): Promise<any>
-  turnPluginOn(name: string | string[])
-  turnPluginOff(name: string)
 }
 
 export class PluginManagerSettings {
@@ -67,7 +64,7 @@ export type PluginPermissions = {
   }
 }
 
-export class PluginManagerComponent extends ViewPlugin extends Plugin implements PluginBase {
+export class PluginManagerComponent extends ViewPlugin implements PluginBase {
   constructor(appManager: RemixAppManager, engine: Engine)
   appManager: RemixAppManager
   pluginSettings: PluginManagerSettings
@@ -143,7 +140,7 @@ export interface RemixUiPluginManagerProps {
   pluginManagerSettings: PluginManagerSettings
 }
 /** @class Reference loaders.
- *  A loader is a get,set based object which load a workspace from a defined sources.
+ *  A loader is a get, set based object which load a workspace from a defined sources.
  *  (localStorage, queryParams)
  **/
 declare class PluginLoader {
@@ -154,14 +151,6 @@ declare class PluginLoader {
   set(plugin: any, actives: any): void
   get(): any
 }
-// eslint-disable-next-line no-redeclare
-export type PluginManagerSettings = {
-  openDialog: () => void
-  onValidation: () => void
-  clearPermission: (from: any, to: any, method: any) => void
-  settings: () => HTMLElement
-  render: () => HTMLElement
-}
 
 export interface DefaultLocalPlugin extends Profile {
   name: string
@@ -198,14 +187,5 @@ export type PluginManagerProfile = Profile & {
   type: 'iframe' | 'ws'
   hash: string
 }
-// eslint-disable-next-line no-redeclare
-export type LocalPlugin = {
-  create: () => Profile
-  updateName: (target: string) => void
-  updateDisplayName: (displayName: string) => void
-  updateProfile: (key: string, e: Event) => void
-  updateMethods: (target: any) => void
-  form: () => HTMLElement
-}
 
 export { }
diff --git a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
index 50a50d1e3d..b18d42bfdd 100644
--- a/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
+++ b/libs/remix-ui/remix-ai/src/lib/components/Default.tsx
@@ -1,22 +1,46 @@
-import React from 'react'
+import React, { useState, useEffect } from 'react'
 import '../remix-ai.css'
-import { DefaultModels, GenerationParams, ChatHistory, HandleStreamResponse, HandleSimpleResponse } from '@remix/remix-ai-core';
+import { DefaultModels, GenerationParams, ChatHistory, HandleStreamResponse } from '@remix/remix-ai-core';
 import { ConversationStarter, StreamSend, StreamingAdapterObserver, useAiChatApi } from '@nlux/react';
 import { AiChat, useAsStreamAdapter, ChatItem } from '@nlux/react';
-import { JsonStreamParser } from '@remix/remix-ai-core';
 import { user, assistantAvatar } from './personas';
 import { highlighter } from '@nlux/highlighter'
 import './color.css'
 import '@nlux/themes/unstyled.css';
+import copy from 'copy-to-clipboard'
 
 export let ChatApi = null
 
 export const Default = (props) => {
+  const [is_streaming, setIS_streaming] = useState<boolean>(false)
+
+  const HandleCopyToClipboard = () => {
+    const markdown = document.getElementsByClassName('nlux-chatSegments-container')
+    if (markdown.length < 1) return
+
+    const codeBlocks = markdown[0].getElementsByClassName('code-block')
+    Array.from(codeBlocks).forEach((block) => {
+      const copyButtons = block.getElementsByClassName('nlux-comp-copyButton')
+      Array.from(copyButtons).forEach((cp_btn) => {
+        const hdlr = async () => {
+          copy(block.textContent)
+        }
+        cp_btn.removeEventListener('click', async() => { hdlr() })
+        cp_btn.addEventListener('click', async () => { hdlr() })
+      })
+    })
+  }
+
+  useEffect(() => {
+    HandleCopyToClipboard();
+  }, [is_streaming]);
+
   const send: StreamSend = async (
     prompt: string,
     observer: StreamingAdapterObserver,
   ) => {
     GenerationParams.stream_result = true
+    setIS_streaming(true)
     GenerationParams.return_stream_response = GenerationParams.stream_result
 
     let response = null
@@ -32,13 +56,15 @@ export const Default = (props) => {
         observer.next(' ') // Add a space to flush the last message
         ChatHistory.pushHistory(prompt, result)
         observer.complete()
+        setTimeout(() => { setIS_streaming(false) }, 1000)
       }
     )
     else {
       observer.next(response)
       observer.complete()
-    }
 
+      setTimeout(() => { setIS_streaming(false) }, 1000)
+    }
   };
   ChatApi = useAiChatApi();
   const conversationStarters: ConversationStarter[] = [
@@ -73,9 +99,9 @@ export const Default = (props) => {
         submitShortcut: 'Enter',
         hideStopButton: false,
       }}
-      messageOptions={{ showCodeBlockCopyButton: false,
+      messageOptions={{ showCodeBlockCopyButton: true,
         editableUserMessages: true,
-        streamingAnimationSpeed: 2,
+        streamingAnimationSpeed: 1,
         waitTimeBeforeStreamCompletion: 1000,
         syntaxHighlighter: highlighter
       }}
diff --git a/libs/remix-ui/run-tab/src/lib/actions/account.ts b/libs/remix-ui/run-tab/src/lib/actions/account.ts
index 4d937cdc5e..503471b9e3 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/account.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/account.ts
@@ -70,7 +70,7 @@ export const createNewBlockchainAccount = async (plugin: RunTab, dispatch: React
         if (plugin.REACT_API.passphrase === plugin.REACT_API.matchPassphrase) {
           cb(plugin.REACT_API.passphrase)
         } else {
-          dispatch(displayNotification('Error', 'Passphase does not match', 'OK', null))
+          dispatch(displayNotification('Error', 'Passphrase does not match', 'OK', null))
         }
         setPassphrase('')
         setMatchPassphrase('')
diff --git a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
index 2c2ee360c4..37fbca3d27 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -22,11 +22,12 @@ const txHelper = remixLib.execution.txHelper
 const txFormat = remixLib.execution.txFormat
 
 const loadContractFromAddress = (plugin: RunTab, address, confirmCb, cb) => {
-  if (/.(.abi)$/.exec(plugin.config.get('currentFile'))) {
+  if (/\.(abi)$/.exec(plugin.config.get('currentFile'))) {
     confirmCb(() => {
       let abi
       try {
         abi = JSON.parse(plugin.editor.currentContent())
+        if (!Array.isArray(abi)) return cb('ABI should be an array object.')
       } catch (e) {
         return cb('Failed to parse the current file as JSON ABI.')
       }
@@ -41,7 +42,7 @@ const loadContractFromAddress = (plugin: RunTab, address, confirmCb, cb) => {
 
 export const getSelectedContract = (contractName: string, compiler: CompilerAbstractType): ContractData => {
   if (!contractName) return null
-  // const compiler = plugin.compilersArtefacts[compilerAtributeName]
+  // const compiler = plugin.compilersArtefacts[compilerAttributeName]
 
   if (!compiler) return null
 
@@ -60,9 +61,9 @@ export const getSelectedContract = (contractName: string, compiler: CompilerAbst
       return txHelper.getConstructorInterface(contract.object.abi)
     },
     getConstructorInputs: () => {
-      const constructorInteface = txHelper.getConstructorInterface(contract.object.abi)
+      const constructorInterface = txHelper.getConstructorInterface(contract.object.abi)
 
-      return txHelper.inputParametersDeclarationToString(constructorInteface.inputs)
+      return txHelper.inputParametersDeclarationToString(constructorInterface.inputs)
     },
     isOverSizeLimit: async (args: string) => {
       const encodedParams = await txFormat.encodeParams(args, txHelper.getConstructorInterface(contract.object.abi))
@@ -308,7 +309,7 @@ export const runTransactions = (
   funcIndex?: number) => {
   let callinfo = ''
   if (lookupOnly) callinfo = 'call'
-  else if (funcABI.type === 'fallback' || funcABI.type === 'receive') callinfo = 'lowLevelInteracions'
+  else if (funcABI.type === 'fallback' || funcABI.type === 'receive') callinfo = 'lowLevelinteractions'
   else callinfo = 'transact'
   _paq.push(['trackEvent', 'udapp', callinfo, plugin.blockchain.getCurrentNetworkStatus().network.name])
 
diff --git a/libs/remix-ui/run-tab/src/lib/actions/index.ts b/libs/remix-ui/run-tab/src/lib/actions/index.ts
index 76b418a97a..134b88c007 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/index.ts
@@ -66,4 +66,4 @@ export const setNetworkName = (networkName: string) => setNetworkNameFromProvide
 export const updateSelectedContract = (contractName) => setSelectedContract(dispatch, contractName)
 export const syncContracts = () => syncContractsInternal(plugin)
 export const isValidProxyAddress = (address: string) => isValidContractAddress(plugin, address)
-export const isValidProxyUpgrade = (proxyAddress: string, contractName: string, solcInput: SolcInput, solcOuput: SolcOutput, solcVersion: string) => isValidContractUpgrade(plugin, proxyAddress, contractName, solcInput, solcOuput, solcVersion)
\ No newline at end of file
+export const isValidProxyUpgrade = (proxyAddress: string, contractName: string, solcInput: SolcInput, solcOutput: SolcOutput, solcVersion: string) => isValidContractUpgrade(plugin, proxyAddress, contractName, solcInput, solcOutput, solcVersion)
\ No newline at end of file
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index b2a6573874..14ecd27699 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -517,10 +517,10 @@ export function ContractDropdownUI(props: ContractDropdownProps) {
         <div className="pt-2 d-flex flex-column sudapp_button udapp_atAddressSect">
           <div className="d-flex flex-row">
             <CustomTooltip placement={'top-end'} tooltipClasses="text-wrap text-left" tooltipId="runAndDeployAddresstooltip" tooltipText={atAddressOptions.title}>
-              <div id="runAndDeployAtAdressButtonContainer" data-title={atAddressOptions.title}>
+              <div id="runAndDeployAtAddressButtonContainer" data-title={atAddressOptions.title}>
                 <button
                   className={atAddressOptions.disabled ? "disabled udapp_atAddress btn btn-sm py-2 btn-primary" : "udapp_atAddress btn btn-sm py-2 btn-primary"}
-                  id="runAndDeployAtAdressButton"
+                  id="runAndDeployAtAddressButton"
                   disabled={atAddressOptions.disabled}
                   style={{ border: 'none' }}
                   onClick={loadFromAddress}
diff --git a/libs/remix-ui/run-tab/src/lib/components/environment.tsx b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
index 1783e30385..092ef3d6ef 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -30,7 +30,11 @@ export function EnvironmentUI(props: EnvironmentProps) {
 
   const forkStatePrompt = (defaultName: string) => {
     return (
-      <div>
+      <div data-id="forkVmStateModal">
+        <ul className='ml-3'>
+          <li><FormattedMessage id="udapp.forkVmStateDesc1"/></li>
+          <li><FormattedMessage id="udapp.forkVmStateDesc2"/></li>
+        </ul>
         <label id="stateName" className="form-check-label" style={{ fontWeight: 'bolder' }}>
           <FormattedMessage id="udapp.forkStateLabel" />
         </label>
@@ -47,12 +51,12 @@ export function EnvironmentUI(props: EnvironmentProps) {
 
   const deleteVmStatePrompt = () => {
     return (
-      <div>
+      <div data-id="deleteVmStateModal">
         <ul className='ml-3'>
-          <li><FormattedMessage id="udapp.deleteVmStateDesc1"/></li>
-          <li><FormattedMessage id="udapp.deleteVmStateDesc2"/></li>
+          <li><FormattedMessage id="udapp.resetVmStateDesc1"/></li>
+          <li><FormattedMessage id="udapp.resetVmStateDesc2"/></li>
         </ul>
-        <FormattedMessage id="udapp.deleteVmStateDesc3"/>
+        <FormattedMessage id="udapp.resetVmStateDesc3"/>
       </div>
     )
   }
@@ -83,15 +87,15 @@ export function EnvironmentUI(props: EnvironmentProps) {
     } else props.runTabPlugin.call('notification', 'toast', `State not available to fork, as no transactions have been made for selected environment & selected workspace.`)
   }
 
-  const deleteVmState = async() => {
+  const resetVmState = async() => {
     _paq.push(['trackEvent', 'udapp', 'deleteState', `deleteState clicked`])
     const context = currentProvider.name
     const contextExists = await props.runTabPlugin.call('fileManager', 'exists', `.states/${context}/state.json`)
     if (contextExists) {
       props.modal(
-        intl.formatMessage({ id: 'udapp.deleteVmStateTitle' }),
+        intl.formatMessage({ id: 'udapp.resetVmStateTitle' }),
         deleteVmStatePrompt(),
-        intl.formatMessage({ id: 'udapp.delete' }),
+        intl.formatMessage({ id: 'udapp.reset' }),
         async () => {
           const currentProvider = await props.runTabPlugin.call('blockchain', 'getCurrentProvider')
           // Reset environment blocks and account data
@@ -103,35 +107,28 @@ export function EnvironmentUI(props: EnvironmentProps) {
           // If there are pinned contracts, delete pinned contracts folder
           const isPinnedContracts = await props.runTabPlugin.call('fileManager', 'exists', `.deploys/pinned-contracts/${context}`)
           if (isPinnedContracts) await props.runTabPlugin.call('fileManager', 'remove', `.deploys/pinned-contracts/${context}`)
-          props.runTabPlugin.call('notification', 'toast', `VM state deleted successfully.`)
-          _paq.push(['trackEvent', 'udapp', 'deleteState', `VM state deleted`])
+          props.runTabPlugin.call('notification', 'toast', `VM state reset successfully.`)
+          _paq.push(['trackEvent', 'udapp', 'deleteState', `VM state reset`])
         },
         intl.formatMessage({ id: 'udapp.cancel' }),
         null
       )
-    } else props.runTabPlugin.call('notification', 'toast', `State not available to delete, as no transactions have been made for selected environment & selected workspace.`)
+    } else props.runTabPlugin.call('notification', 'toast', `State not available to reset, as no transactions have been made for selected environment & selected workspace.`)
   }
 
   const isL2 = (providerDisplayName: string) => providerDisplayName && (providerDisplayName.startsWith('L2 - Optimism') || providerDisplayName.startsWith('L2 - Arbitrum'))
   return (
     <div className="udapp_crow">
-      <label id="selectExEnv" className="udapp_settingsLabel">
+      <label id="selectExEnv" className="udapp_settingsLabel w-100">
         <FormattedMessage id="udapp.environment" />
-        <CustomTooltip placement={'auto-end'} tooltipClasses="text-nowrap" tooltipId="info-recorder" tooltipText={<FormattedMessage id="udapp.tooltipText2" />}>
-          <a href="https://chainlist.org/" target="_blank">
-            <i className={'ml-2 fas fa-plug'} aria-hidden="true"></i>
-          </a>
-        </CustomTooltip>
-        <CustomTooltip placement={'auto-end'} tooltipClasses="text-wrap" tooltipId="runAndDeployAddresstooltip" tooltipText={<FormattedMessage id="udapp.environmentDocs" />}>
-          <a href="https://remix-ide.readthedocs.io/en/latest/run.html#environment" target="_blank" rel="noreferrer">
-            <i className="udapp_infoDeployAction ml-2 fas fa-info"></i>
-          </a>
-        </CustomTooltip>
         { currentProvider && currentProvider.isVM && isSaveEvmStateChecked && <CustomTooltip placement={'auto-end'} tooltipClasses="text-wrap" tooltipId="forkStatetooltip" tooltipText={<FormattedMessage id="udapp.forkStateTitle" />}>
-          <i className="udapp_infoDeployAction ml-2 fas fa-code-branch" style={{ cursor: 'pointer' }} onClick={forkState}></i>
+          <i className="udapp_infoDeployAction ml-2 fas fa-code-branch" style={{ cursor: 'pointer' }} onClick={forkState} data-id="fork-state-icon"></i>
         </CustomTooltip> }
-        { currentProvider && currentProvider.isVM && isSaveEvmStateChecked && <CustomTooltip placement={'auto-end'} tooltipClasses="text-wrap" tooltipId="deleteVMStatetooltip" tooltipText={<FormattedMessage id="udapp.deleteVmStateTitle" />}>
-          <i className="udapp_infoDeployAction ml-2 fas fa-trash" style={{ cursor: 'pointer' }} onClick={deleteVmState}></i>
+        { currentProvider && currentProvider.isVM && isSaveEvmStateChecked && <CustomTooltip placement={'auto-end'} tooltipClasses="text-wrap" tooltipId="deleteVMStatetooltip" tooltipText={<FormattedMessage id="udapp.resetVmStateTitle" />}>
+          <span onClick={resetVmState} style={{ cursor: 'pointer', float: 'right', textTransform: 'none' }}>
+            <i className="udapp_infoDeployAction ml-2 fas fa-refresh" data-id="delete-state-icon"></i>
+            <span className="ml-1" style = {{ textTransform: 'none', fontSize: '13px' }}>Reset State</span>
+          </span>
         </CustomTooltip> }
       </label>
       <div className="udapp_environment" data-id={`selected-provider-${currentProvider && currentProvider.name}`}>
diff --git a/libs/remix-ui/run-tab/src/lib/run-tab.tsx b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
index c6eb716af6..d352347eb9 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -235,6 +235,16 @@ export function RunTabUI(props: RunTabProps) {
     }
   }, [runTab.popup])
 
+  useEffect(() => {
+    if (runTab.selectExEnv.includes('injected') &&
+      Object.entries(runTab.accounts.loadedAccounts).length === 0 &&
+    runTab.accounts.selectedAccount.length > 0) {
+      // switch to vm-cancum because no account is loaded from injected provider
+      const context = plugin.blockchain.defaultPinnedProviders[0] // vm-cancun
+      setExecutionEnvironment({ context, fork: '' })
+    }
+  }, [runTab.accounts.loadedAccounts])
+
   const setCheckIpfs = (value: boolean) => {
     dispatch(setIpfsCheckedState(value))
   }
diff --git a/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts b/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
index 428c782a8e..d47d0d89f7 100644
--- a/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/blockchain.d.ts
@@ -25,6 +25,7 @@ export class Blockchain extends Plugin<any, any> {
     };
   setupProviders(): void;
   providers: any;
+  defaultPinnedProviders: string[];
   getCurrentProvider(): any;
   /** Return the list of accounts */
   getAccounts(cb?: any): any;
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index 2b76a8cfb8..cb5ec1cb35 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -282,7 +282,7 @@ export interface ContractDropdownProps {
   setSelectedContract: (contractName: string) => void
   remixdActivated: boolean,
   isValidProxyAddress?: (address: string) => Promise<boolean>,
-  isValidProxyUpgrade?: (proxyAddress: string, contractName: string, solcInput: SolcInput, solcOuput: SolcOutput, solcVersion: string) => Promise<LayoutCompatibilityReport | { ok: boolean, pass: boolean, warning: boolean }>,
+  isValidProxyUpgrade?: (proxyAddress: string, contractName: string, solcInput: SolcInput, solcOutput: SolcOutput, solcVersion: string) => Promise<LayoutCompatibilityReport | { ok: boolean, pass: boolean, warning: boolean }>,
   proxy: { deployments: { address: string, date: string, contractName: string }[] }
   solCompilerVersion: { version: string, canReceive: boolean }
   setCompilerVersion: React.Dispatch<React.SetStateAction<{
diff --git a/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx b/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx
index 52692be16f..a241f2713d 100644
--- a/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx
+++ b/libs/remix-ui/scriptrunner/src/lib/script-runner-ui.tsx
@@ -5,6 +5,7 @@ import { faCaretDown, faCaretRight, faCheck, faExclamationCircle, faRedoAlt, faT
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { CustomScriptRunner } from "./custom-script-runner";
 import { CustomTooltip } from "@remix-ui/helper";
+const _paq = (window._paq = window._paq || []) // eslint-disable-line
 
 export interface ScriptRunnerUIProps {
   loadScriptRunner: (config: ProjectConfiguration) => void;
@@ -62,12 +63,18 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
 
                 </div>}
                 {!config.isLoading && config.errorStatus && config.error &&
-                  <div onClick={() => loadScriptRunner(config)} className="pointer px-2">
+                  <div
+                    onClick={() => {
+                      loadScriptRunner(config)
+                      _paq.push(['trackEvent', 'scriptRunnerPlugin', 'loadScriptRunnerConfig', config.name])
+                    }}
+                    className="pointer px-2"
+                  >
                     <FontAwesomeIcon data-id={`sr-reload-${config.name}`} icon={faRedoAlt}></FontAwesomeIcon>
                   </div>}
                 {!config.isLoading && !config.errorStatus && !config.error &&
                   <div onClick={() => loadScriptRunner(config)} className="pointer px-2">
-                    {activeConfig && activeConfig.name !== config.name ?
+                    { activeConfig && activeConfig.name !== config.name ?
                       <FontAwesomeIcon data-id={`sr-toggle-${config.name}`} icon={faToggleOn}></FontAwesomeIcon> :
                       <FontAwesomeIcon data-id={`sr-loaded-${config.name}`} className="text-success" icon={faCheck}></FontAwesomeIcon>
                     }
@@ -87,7 +94,9 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
                     </li>
                   ))}
                 </ul></>
-            </Accordion.Collapse></div>))}
+            </Accordion.Collapse>
+          </div>))
+        }
       </Accordion>
       {enableCustomScriptRunner &&
         <CustomScriptRunner
@@ -98,6 +107,6 @@ export const ScriptRunnerUI = (props: ScriptRunnerUIProps) => {
           publishedConfigurations={configurations.filter((config) => config.publish)}
         />}
     </div>
-  );
-};
+  )
+}
 
diff --git a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
index 2878b491c6..cb1e28495a 100644
--- a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
+++ b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx
@@ -13,10 +13,10 @@ interface ResultSummaryProps {
 
 export const ResultSummary = (props: ResultSummaryProps) => {
   const intl = useIntl()
-  const { hightLightInPath, replaceText, state } = useContext(SearchContext)
+  const { highlightInPath, replaceText, state } = useContext(SearchContext)
   const { modal } = useDialogDispatchers()
   const selectLine = async (line: SearchResultLineLine) => {
-    await hightLightInPath(props.searchResult, line)
+    await highlightInPath(props.searchResult, line)
   }
 
   const confirmReplace = async (line: SearchResultLineLine) => {
diff --git a/libs/remix-ui/search/src/lib/context/context.tsx b/libs/remix-ui/search/src/lib/context/context.tsx
index 336955c744..e0d7933042 100644
--- a/libs/remix-ui/search/src/lib/context/context.tsx
+++ b/libs/remix-ui/search/src/lib/context/context.tsx
@@ -19,7 +19,7 @@ export interface SearchingStateInterface {
   setWholeWord: (value: boolean) => void
   setSearchResults: (value: SearchResult[]) => void
   findText: (path: string) => Promise<SearchResultLine[]>
-  hightLightInPath: (result: SearchResult, line: SearchResultLineLine) => void
+  highlightInPath: (result: SearchResult, line: SearchResultLineLine) => void
   replaceText: (result: SearchResult, line: SearchResultLineLine) => Promise<void>
   reloadFile: (file: string) => void
   toggleCaseSensitive: () => void
@@ -194,7 +194,7 @@ export const SearchProvider = ({ children = [], reducer = SearchReducer, initial
         // do nothing
       }
     },
-    hightLightInPath: async (result: SearchResult, line: SearchResultLineLine) => {
+    highlightInPath: async (result: SearchResult, line: SearchResultLineLine) => {
       await plugin.call('editor', 'discardHighlight')
       await plugin.call('editor', 'highlight', line.position, result.path)
       await plugin.call('editor', 'revealRange', line.position.start.line, line.position.start.column, line.position.end.line, line.position.end.column)
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 244e83b799..1854646896 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
@@ -486,6 +486,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     compileIcon.current.classList.remove('remixui_spinningIcon')
     compileIcon.current.classList.remove('remixui_bouncingIcon')
     if (!state.autoCompile || (state.autoCompile && state.matomoAutocompileOnce)) {
+      _paq.push(['trackEvent', 'compiler', 'compiled', 'solCompilationFinishedTriggeredByUser'])
       _paq.push(['trackEvent', 'compiler', 'compiled', 'with_config_file_' + state.useFileConfiguration])
       _paq.push(['trackEvent', 'compiler', 'compiled', 'with_version_' + _retrieveVersion()])
       if (state.autoCompile && state.matomoAutocompileOnce) {
diff --git a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
index d9f9b44955..0d279961a3 100644
--- a/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
+++ b/libs/remix-ui/tabs/src/lib/remix-ui-tabs.tsx
@@ -88,7 +88,12 @@ export const TabsUI = (props: TabsUIProps) => {
 
   const getAI = async () => {
     try {
-      return await props.plugin.call('settings', 'getCopilotSetting')
+      const init_state = await props.plugin.call('settings', 'getCopilotSetting')
+      if (init_state === undefined || init_state === null) {
+        await props.plugin.call('settings', 'updateCopilotChoice', ai_switch)
+        return ai_switch
+      }
+      return init_state
     } catch (e) {
       return false
     }
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 4e0d224c1b..e2f281ed4b 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -235,12 +235,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
     try {
       if (script.trim().startsWith('git')) {
         // await this.call('git', 'execute', script) code might be used in the future
-        // TODO: rm gpt or redirect gpt to sol-pgt
-      } else if (script.trim().startsWith('gpt')) {
-        call('terminal', 'log',{ type: 'warn', value: `> ${script}` })
-        await call('remixAI', 'solidity_answer', script) // No streaming supported in terminal
-        _paq.push(['trackEvent', 'ai', 'remixAI', 'askFromTerminal'])
-      } else if (script.trim().startsWith('sol-gpt')) {
+      } else if (script.trim().startsWith('gpt') || script.trim().startsWith('sol-gpt')) {
         call('terminal', 'log',{ type: 'warn', value: `> ${script}` })
         await call('remixAI', 'solidity_answer', script) // No streaming supported in terminal
         _paq.push(['trackEvent', 'ai', 'remixAI', 'askFromTerminal'])
diff --git a/libs/remix-ui/workspace/src/lib/types/index.ts b/libs/remix-ui/workspace/src/lib/types/index.ts
index ba23f4cdc2..e98dbd2075 100644
--- a/libs/remix-ui/workspace/src/lib/types/index.ts
+++ b/libs/remix-ui/workspace/src/lib/types/index.ts
@@ -70,7 +70,7 @@ export interface FilePanelType extends ViewPlugin {
   setWorkspace: ({ name, isLocalhost }, setEvent: boolean) => void
   createWorkspace: (name: string, workspaceTemplateName: string) => void
   renameWorkspace: (oldName: string, newName: string) => void
-  compileContractForUml: (path: string) => void
+  compileContractForUml?: (path: string) => void
   workspaceRenamed: ({ name }) => void
   workspaceCreated: ({ name }) => void
   workspaceDeleted: ({ name }) => void
@@ -81,7 +81,7 @@ export interface FilePanelType extends ViewPlugin {
   appManager: RemixAppManager
   registry?: any // registry
   pluginApi?: any
-  request: {
+  request?: {
     createWorkspace: () => void
     setWorkspace: (workspaceName: string) => void
     createNewFile: () => void
@@ -89,10 +89,10 @@ export interface FilePanelType extends ViewPlugin {
     getCurrentWorkspace: () => void
   } // api request,
   workspaces: any
-  registeredMenuItems: MenuItems // menu items
-  removedMenuItems: MenuItems
-  initialWorkspace: string
-  resetNewFile: () => void
+  registeredMenuItems?: MenuItems // menu items
+  removedMenuItems?: MenuItems
+  initialWorkspace?: string
+  resetNewFile?: () => void
   getWorkspaces: () => string[]
   expandPath: string[]
 }
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index 57b368e350..a14bc260c2 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.91",
+  "version": "0.0.92",
   "description": "Solidity import url resolver engine",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -41,5 +41,5 @@
     "typescript": "^3.1.6"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "baa8abc9b912288b7a2546bedc717a9229f652c4"
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
 }
\ No newline at end of file
diff --git a/libs/remix-url-resolver/src/resolve.ts b/libs/remix-url-resolver/src/resolve.ts
index f4b5b0a629..a859643325 100644
--- a/libs/remix-url-resolver/src/resolve.ts
+++ b/libs/remix-url-resolver/src/resolve.ts
@@ -140,8 +140,8 @@ export class RemixURLResolver {
   async handleNpmImport(url: string): Promise<HandlerResponse> {
     if (!url) throw new Error('url is empty')
     let fetchUrl = url
-    const isVersionned = semverRegex().exec(url.replace(/@/g, '@ ').replace(/\//g, ' /'))
-    if (this.getDependencies && !isVersionned) {
+    const isVersioned = semverRegex().exec(url.replace(/@/g, '@ ').replace(/\//g, ' /'))
+    if (this.getDependencies && !isVersioned) {
       try {
         const { deps, yarnLock, packageLock } = await this.getDependencies()
         let matchLength = 0
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index 3da2144d9b..e9f6efaa57 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.56",
+  "version": "1.0.57",
   "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": "baa8abc9b912288b7a2546bedc717a9229f652c4"
+  "gitHead": "a92b8aa830067f879c96b41e301bc3174b87e551"
 }
\ 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
index 692aedf612..54a6742bdc 100644
--- 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
@@ -4,7 +4,7 @@
 
     This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
 
-    snarkJS is a free software: you can redistribute it and/or modify it
+    snarkJS is 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.
@@ -162,4 +162,4 @@ contract Groth16Verifier {
              return(0, 0x20)
          }
      }
- }
\ No newline at end of file
+ }
diff --git a/libs/remix-ws-templates/src/templates/rln/templates/plonk_verifier.sol.ejs b/libs/remix-ws-templates/src/templates/rln/templates/plonk_verifier.sol.ejs
index 963bade7f1..95fe2ba470 100644
--- a/libs/remix-ws-templates/src/templates/rln/templates/plonk_verifier.sol.ejs
+++ b/libs/remix-ws-templates/src/templates/rln/templates/plonk_verifier.sol.ejs
@@ -4,7 +4,7 @@
 
     This file is generated with [snarkJS](https://github.com/iden3/snarkjs).
 
-    snarkJS is a free software: you can redistribute it and/or modify it
+    snarkJS is 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.
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index f984bfcc9e..c6006fe2b0 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.42",
+  "version": "0.6.43",
   "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/libs/remixd/src/bin/remixd.ts b/libs/remixd/src/bin/remixd.ts
index c6e9743734..68bfdb2c0c 100644
--- a/libs/remixd/src/bin/remixd.ts
+++ b/libs/remixd/src/bin/remixd.ts
@@ -95,7 +95,7 @@ function errorHandler (error: any, service: string) {
     console.log('\x1b[33m%s\x1b[0m', '[WARN] You may now only use IDE at ' + options.remixIde + ' to connect to that instance')
   }
 
-  if (!options.sharedFolder) options.sharedFolder = process.cwd() // if no specified, use the current folder
+  if (!options.sharedFolder) options.sharedFolder = process.cwd() // if not specified, use the current folder
 
   if (options.sharedFolder && existsSync(absolutePath('./', options.sharedFolder))) {
     console.log('\x1b[33m%s\x1b[0m', '[WARN] Any application that runs on your computer can potentially read from and write to all files in the directory.')
diff --git a/releaseDetails.json b/releaseDetails.json
index ef07d71106..518103ed3b 100644
--- a/releaseDetails.json
+++ b/releaseDetails.json
@@ -1,11 +1,10 @@
 {
-    "version": "v0.59.0",
+    "version": "v0.60.0",
     "title": "RELEASE HIGHLIGHTS",
-    "highlight1": "Fork & delete VM state",
-    "highlight2": "Syntax highlighting for Noir(.nr) files",
-    "highlight3": "",
+    "highlight1": "Delete forked state environments",
+    "highlight2": "Scan code pasted into editor using AI",
+    "highlight3": "Added Linea chain deployment environment",
     "highlight4": "",
     "more": "Read More",
-    "moreLink": "https://medium.com/remix-ide/remix-release-v0-59-0-306881e41984?source=friends_link&sk=be2390827519bf2d7530f013021160b9"
+    "moreLink": "https://medium.com/remix-ide/remix-release-v0-60-0-a86fb7649d62?source=friends_link&sk=63c8c24be0b818dbd855947f2804aad2"
   }
-  
\ No newline at end of file