diff --git a/.github/workflows/pr-reminder.yml b/.github/workflows/pr-reminder.yml
index eaedd51125..ee24eebb0b 100644
--- a/.github/workflows/pr-reminder.yml
+++ b/.github/workflows/pr-reminder.yml
@@ -14,4 +14,4 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        freeze-date: '2024-09-09T18:00:00Z'
+        freeze-date: '2024-10-07T18:00:00Z'
diff --git a/apps/circuit-compiler/src/app/actions/index.ts b/apps/circuit-compiler/src/app/actions/index.ts
index 2f48faf2fb..84417c7fea 100644
--- a/apps/circuit-compiler/src/app/actions/index.ts
+++ b/apps/circuit-compiler/src/app/actions/index.ts
@@ -3,7 +3,6 @@ import type { CircomPluginClient } from "../services/circomPluginClient"
 import { ActionPayloadTypes, AppState, ICircuitAppContext } from "../types"
 import { GROTH16_VERIFIER, PLONK_VERIFIER } from './constant'
 import { extractNameFromKey, extractParentFromKey } from '@remix-ui/helper'
-import { ethers } from 'ethers'
 
 export const compileCircuit = async (plugin: CircomPluginClient, appState: AppState) => {
   try {
@@ -19,12 +18,21 @@ export const compileCircuit = async (plugin: CircomPluginClient, appState: AppSt
   }
 }
 
-export const computeWitness = async (plugin: CircomPluginClient, status: string, witnessValues: Record<string, string>) => {
+export const computeWitness = async (plugin: CircomPluginClient, appState: AppState, dispatch: ICircuitAppContext['dispatch'], status: string, witnessValues: Record<string, string>) => {
   try {
     if (status !== "computing") {
       const input = JSON.stringify(witnessValues)
+      const witness = await plugin.computeWitness(input)
 
-      await plugin.computeWitness(input)
+      if (appState.exportWtnsJson) {
+        const wtns = await snarkjs.wtns.exportJson(witness)
+        const wtnsJson = wtns.map(wtn => wtn.toString())
+        const fileName = extractNameFromKey(appState.filePath)
+        const writePath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '.wtn.json')}`
+
+        await plugin.call('fileManager', 'writeFile', writePath, JSON.stringify(wtnsJson, null, 2))
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'wtns.exportJson', writePath])
+      }
     } else {
       console.log('Existing witness computation in progress')
     }
@@ -38,6 +46,8 @@ export const computeWitness = async (plugin: CircomPluginClient, status: string,
 export const runSetupAndExport = async (plugin: CircomPluginClient, appState: AppState, dispatch: ICircuitAppContext['dispatch']) => {
   try {
     dispatch({ type: 'SET_COMPILER_STATUS', payload: 'exporting' })
+    dispatch({ type: 'SET_SETUP_EXPORT_FEEDBACK', payload: null })
+    plugin.emit('statusChanged', { key: 'none' })
     const ptau_final = `https://ipfs-cluster.ethdevops.io/ipfs/${appState.ptauList.find(ptau => ptau.name === appState.ptauValue)?.ipfsHash}`
     await plugin.generateR1cs(appState.filePath, { version: appState.version, prime: appState.primeValue })
 
@@ -50,32 +60,38 @@ export const runSetupAndExport = async (plugin: CircomPluginClient, appState: Ap
     const zkey_final = { type: "mem" }
 
     if (appState.provingScheme === 'groth16') {
+      plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'provingScheme', 'groth16'])
       await snarkjs.zKey.newZKey(r1cs, ptau_final, zkey_final, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
       const vKey = await snarkjs.zKey.exportVerificationKey(zkey_final, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
 
       if (appState.exportVerificationKey) {
         await plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/groth16/zk/keys/verification_key.json`, JSON.stringify(vKey, null, 2))
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'zKey.exportVerificationKey', `${extractParentFromKey(appState.filePath)}/groth16/zk/keys/verification_key.json`])
       }
       if (appState.exportVerificationContract) {
         const templates = { groth16: GROTH16_VERIFIER }
         const solidityContract = await snarkjs.zKey.exportSolidityVerifier(zkey_final, templates, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
 
         await plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/groth16/zk/build/zk_verifier.sol`, solidityContract)
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'zKey.exportSolidityVerifier', `${extractParentFromKey(appState.filePath)}/groth16/zk/build/zk_verifier.sol`])
       }
       dispatch({ type: 'SET_ZKEY', payload: zkey_final })
       dispatch({ type: 'SET_VERIFICATION_KEY', payload: vKey })
     } else if (appState.provingScheme === 'plonk') {
+      plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'provingScheme', 'plonk'])
       await snarkjs.plonk.setup(r1cs, ptau_final, zkey_final, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
       const vKey = await snarkjs.zKey.exportVerificationKey(zkey_final, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
 
       if (appState.exportVerificationKey) {
         await plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/plonk/zk/keys/verification_key.json`, JSON.stringify(vKey, null, 2))
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'zKey.exportVerificationKey', `${extractParentFromKey(appState.filePath)}/plonk/zk/keys/verification_key.json`])
       }
       if (appState.exportVerificationContract) {
         const templates = { plonk: PLONK_VERIFIER }
         const solidityContract = await snarkjs.zKey.exportSolidityVerifier(zkey_final, templates, zkLogger(plugin, dispatch, 'SET_SETUP_EXPORT_FEEDBACK'))
 
         await plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/plonk/zk/build/zk_verifier.sol`, solidityContract)
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'zKey.exportSolidityVerifier', `${extractParentFromKey(appState.filePath)}/plonk/zk/build/zk_verifier.sol`])
       }
       dispatch({ type: 'SET_ZKEY', payload: zkey_final })
       dispatch({ type: 'SET_VERIFICATION_KEY', payload: vKey })
@@ -83,6 +99,7 @@ export const runSetupAndExport = async (plugin: CircomPluginClient, appState: Ap
     dispatch({ type: 'SET_COMPILER_STATUS', payload: 'idle' })
     dispatch({ type: 'SET_SETUP_EXPORT_STATUS', payload: 'done' })
   } catch (e) {
+    plugin._paq.push(['trackEvent', 'circuit-compiler', 'runSetupAndExport', 'error', e.message])
     dispatch({ type: 'SET_COMPILER_STATUS', payload: 'errored' })
     console.error(e)
   }
@@ -91,6 +108,8 @@ export const runSetupAndExport = async (plugin: CircomPluginClient, appState: Ap
 export const generateProof = async (plugin: CircomPluginClient, appState: AppState, dispatch: ICircuitAppContext['dispatch']) => {
   try {
     dispatch({ type: 'SET_COMPILER_STATUS', payload: 'proving' })
+    dispatch({ type: 'SET_PROOF_FEEDBACK', payload: null })
+    plugin.emit('statusChanged', { key: 'none' })
     const fileName = extractNameFromKey(appState.filePath)
     const r1csPath = extractParentFromKey(appState.filePath) + `/.bin/${fileName.replace('.circom', '.r1cs')}`
     // @ts-ignore
@@ -110,21 +129,27 @@ export const generateProof = async (plugin: CircomPluginClient, appState: AppSta
       const { proof, publicSignals } = await snarkjs.groth16.prove(zkey_final, wtns, zkLogger(plugin, dispatch, 'SET_PROOF_FEEDBACK'))
       const verified = await snarkjs.groth16.verify(vKey, publicSignals, proof, zkLogger(plugin, dispatch, 'SET_PROOF_FEEDBACK'))
 
+      plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/groth16/zk/build/proof.json`, JSON.stringify(proof, null, 2))
       plugin.call('terminal', 'log', { type: 'log', value: 'zk proof validity ' + verified })
+      plugin._paq.push(['trackEvent', 'circuit-compiler', 'generateProof', 'groth16.prove', verified])
       if (appState.exportVerifierCalldata) {
         const calldata = await snarkjs.groth16.exportSolidityCallData(proof, publicSignals)
 
         plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/groth16/zk/build/verifierCalldata.json`, calldata)
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'generateProof', 'groth16.exportSolidityCallData', `${extractParentFromKey(appState.filePath)}/groth16/zk/build/verifierCalldata.json`])
       }
     } else if (appState.provingScheme === 'plonk') {
       const { proof, publicSignals } = await snarkjs.plonk.prove(zkey_final, wtns, zkLogger(plugin, dispatch, 'SET_PROOF_FEEDBACK'))
       const verified = await snarkjs.plonk.verify(vKey, publicSignals, proof, zkLogger(plugin, dispatch, 'SET_PROOF_FEEDBACK'))
 
+      plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/plonk/zk/build/proof.json`, JSON.stringify(proof, null, 2))
       plugin.call('terminal', 'log', { type: 'log', value: 'zk proof validity ' + verified })
+      plugin._paq.push(['trackEvent', 'circuit-compiler', 'generateProof', 'plonk.prove', verified])
       if (appState.exportVerifierCalldata) {
         const calldata = await snarkjs.plonk.exportSolidityCallData(proof, publicSignals)
 
         plugin.call('fileManager', 'writeFile', `${extractParentFromKey(appState.filePath)}/plonk/zk/build/verifierCalldata.json`, calldata)
+        plugin._paq.push(['trackEvent', 'circuit-compiler', 'generateProof', 'plonk.exportSolidityCallData', `${extractParentFromKey(appState.filePath)}/plonk/zk/build/verifierCalldata.json`])
       }
     }
     dispatch({ type: 'SET_COMPILER_STATUS', payload: 'idle' })
diff --git a/apps/circuit-compiler/src/app/components/container.tsx b/apps/circuit-compiler/src/app/components/container.tsx
index 7cf3fe7ac1..2c7cc41e16 100644
--- a/apps/circuit-compiler/src/app/components/container.tsx
+++ b/apps/circuit-compiler/src/app/components/container.tsx
@@ -140,7 +140,7 @@ export function Container () {
             <RenderIf condition={circuitApp.appState.signalInputs.length > 0}>
               <Toggler title='circuit.computeWitness' dataId='witness_toggler' show={!!circuitApp.appState.setupExportStatus}>
                 <>
-                  <WitnessSection plugin={circuitApp.plugin} signalInputs={circuitApp.appState.signalInputs} status={circuitApp.appState.status} />
+                  <WitnessSection />
                   <RenderIf condition={circuitApp.appState.status !== 'computing'}>
                     <CompilerFeedback feedback={circuitApp.appState.computeFeedback} filePathToId={circuitApp.appState.filePathToId} openErrorLocation={handleOpenErrorLocation} hideWarnings={circuitApp.appState.hideWarnings} askGPT={askGPT} />
                   </RenderIf>
diff --git a/apps/circuit-compiler/src/app/components/witness.tsx b/apps/circuit-compiler/src/app/components/witness.tsx
index 0a14537cde..dd40b9b2d0 100644
--- a/apps/circuit-compiler/src/app/components/witness.tsx
+++ b/apps/circuit-compiler/src/app/components/witness.tsx
@@ -1,12 +1,14 @@
 import { RenderIf, RenderIfNot } from "@remix-ui/helper";
 import { FormattedMessage } from "react-intl";
-import { CompilerStatus } from "../types";
 import { computeWitness } from "../actions";
-import { useState } from "react";
-import type { CircomPluginClient } from "../services/circomPluginClient";
+import { useContext, useState } from "react";
 import * as remixLib from '@remix-project/remix-lib'
+import { CircuitAppContext } from "../contexts";
 
-export function WitnessSection ({ plugin, signalInputs, status }: {plugin: CircomPluginClient, signalInputs: string[], status: CompilerStatus}) {
+export function WitnessSection () {
+  const circuitApp = useContext(CircuitAppContext)
+  const { signalInputs, status, exportWtnsJson } = circuitApp.appState
+  const { plugin, dispatch, appState } = circuitApp
   const [witnessValues, setWitnessValues] = useState<Record<string, string>>({})
 
   const handleSignalInput = (e: any) => {
@@ -47,9 +49,22 @@ export function WitnessSection ({ plugin, signalInputs, status }: {plugin: Circo
               </div>
             ))
           }
+          <div className="custom-control custom-checkbox">
+            <input
+              className="custom-control-input"
+              type="checkbox"
+              title="Export Witness As JSON"
+              id="circuitExportWtnsJson"
+              onChange={() => { dispatch({ type: 'SET_EXPORT_WTNS_JSON', payload: !exportWtnsJson }) }}
+              checked={exportWtnsJson}
+            />
+            <label className="form-check-label custom-control-label pt-1" htmlFor="circuitExportWtnsJson">
+              <FormattedMessage id="circuit.exportWtnsJson" />
+            </label>
+          </div>
           <button
             className="btn btn-secondary btn-block d-block w-100 text-break mb-1 mt-1"
-            onClick={() => { computeWitness(plugin, status, witnessValues) }}
+            onClick={() => { computeWitness(plugin, appState, dispatch, status, witnessValues) }}
             disabled={(status === "compiling") || (status === "computing")}
             data-id="compute_witness_btn"
           >
diff --git a/apps/circuit-compiler/src/app/reducers/state.ts b/apps/circuit-compiler/src/app/reducers/state.ts
index 78707da38e..cc3db06ca2 100644
--- a/apps/circuit-compiler/src/app/reducers/state.ts
+++ b/apps/circuit-compiler/src/app/reducers/state.ts
@@ -23,6 +23,7 @@ export const appInitialState: AppState = {
   exportVerificationContract: true,
   exportVerificationKey: true,
   exportVerifierCalldata: true,
+  exportWtnsJson: false,
   verificationKey: null,
   zKey: null
 }
@@ -138,6 +139,12 @@ export const appReducer = (state = appInitialState, action: Actions): AppState =
       setupExportStatus: action.payload
     }
 
+  case 'SET_EXPORT_WTNS_JSON':
+    return {
+      ...state,
+      exportWtnsJson: action.payload
+    }
+
   case 'SET_VERIFICATION_KEY':
     return {
       ...state,
diff --git a/apps/circuit-compiler/src/app/services/circomPluginClient.ts b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
index f6817fe7a5..15bfa518a0 100644
--- a/apps/circuit-compiler/src/app/services/circomPluginClient.ts
+++ b/apps/circuit-compiler/src/app/services/circomPluginClient.ts
@@ -20,7 +20,7 @@ export class CircomPluginClient extends PluginClient {
   private lastParsedFiles: Record<string, string> = {}
   private lastCompiledFile: string = ''
   private compiler: typeof compilerV215 & typeof compilerV216 & typeof compilerV217 & typeof compilerV218
-  private _paq = {
+  public _paq = {
     push: (args) => {
       this.call('matomo' as any, 'track', args)
     }
@@ -237,7 +237,7 @@ export class CircomPluginClient extends PluginClient {
     }
   }
 
-  async computeWitness (input: string): Promise<void> {
+  async computeWitness (input: string): Promise<Uint8Array> {
     this.internalEvents.emit('circuit_computing_witness_start')
     this.emit('statusChanged', { key: 'loading', title: 'Computing...', type: 'info' })
     const wasmPath = this.lastCompiledCircuitPath
@@ -249,9 +249,10 @@ export class CircomPluginClient extends PluginClient {
     const witness = this.compiler ? await this.compiler.generate_witness(dataRead, input) : await generate_witness(dataRead, input)
     // @ts-ignore
     await this.call('fileManager', 'writeFile', wasmPath.replace('.wasm', '.wtn'), witness, true)
-    this._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'Witness computing successful'])
+    this._paq.push(['trackEvent', 'circuit-compiler', 'computeWitness', 'compiler.generate_witness', wasmPath.replace('.wasm', '.wtn')])
     this.internalEvents.emit('circuit_computing_witness_done')
     this.emit('statusChanged', { key: 'succeed', title: 'witness computed successfully', type: 'success' })
+    return witness
   }
 
   async resolveDependencies(filePath: string, fileContent: string, output?: Record<string, string>, depPath: string = '', blackPath: string[] = []): Promise<Record<string, string>> {
diff --git a/apps/circuit-compiler/src/app/types/index.ts b/apps/circuit-compiler/src/app/types/index.ts
index de36f80513..b1ad621b94 100644
--- a/apps/circuit-compiler/src/app/types/index.ts
+++ b/apps/circuit-compiler/src/app/types/index.ts
@@ -39,6 +39,7 @@ export interface ActionPayloadTypes {
   SET_EXPORT_VERIFICATION_CONTRACT: boolean,
   SET_EXPORT_VERIFICATION_KEY: boolean,
   SET_EXPORT_VERIFIER_CALLDATA: boolean,
+  SET_EXPORT_WTNS_JSON: boolean,
   SET_SETUP_EXPORT_STATUS: SetupExportStatus,
   SET_VERIFICATION_KEY: Record<string, any>,
   SET_ZKEY: any
@@ -71,6 +72,7 @@ export interface AppState {
   exportVerificationContract: boolean,
   exportVerificationKey: boolean,
   exportVerifierCalldata: boolean,
+  exportWtnsJson: boolean,
   verificationKey: Record<string, any>,
   zKey: Uint8Array
 }
diff --git a/apps/etherscan/src/app/views/VerifyView.tsx b/apps/etherscan/src/app/views/VerifyView.tsx
index f41e9203af..e8f4011072 100644
--- a/apps/etherscan/src/app/views/VerifyView.tsx
+++ b/apps/etherscan/src/app/views/VerifyView.tsx
@@ -1,5 +1,5 @@
 import React, {useEffect, useRef, useState} from 'react'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 
 import {PluginClient} from '@remixproject/plugin'
 import {CustomTooltip} from '@remix-ui/helper'
diff --git a/apps/remix-ide-e2e/src/githttpbackend/package.json b/apps/remix-ide-e2e/src/githttpbackend/package.json
index 3e44990386..4d3ff11185 100644
--- a/apps/remix-ide-e2e/src/githttpbackend/package.json
+++ b/apps/remix-ide-e2e/src/githttpbackend/package.json
@@ -1,13 +1,17 @@
 {
   "scripts": {
-    "start:server": "npx ts-node server.ts"
+    "start:server": "tsc && node ./dist/server.js"
   },
   "dependencies": {
-    "body-parser": "^1.20.2",
+    "body-parser": "^1.20.3",
     "child_process": "^1.0.2",
-    "express": "^4.19.2",
+    "express": "^4.20.0",
     "git-http-backend": "^1.1.2",
     "path": "^0.12.7",
     "zlib": "^1.0.5"
+  },
+  "devDependencies": {
+    "@types/node": "^22.5.4",
+    "typescript": "^5.6.2"
   }
 }
diff --git a/apps/remix-ide-e2e/src/githttpbackend/server.ts b/apps/remix-ide-e2e/src/githttpbackend/src/server.ts
similarity index 100%
rename from apps/remix-ide-e2e/src/githttpbackend/server.ts
rename to apps/remix-ide-e2e/src/githttpbackend/src/server.ts
diff --git a/apps/remix-ide-e2e/src/githttpbackend/tsconfig.json b/apps/remix-ide-e2e/src/githttpbackend/tsconfig.json
new file mode 100644
index 0000000000..7b867a47ae
--- /dev/null
+++ b/apps/remix-ide-e2e/src/githttpbackend/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "target": "ES6", // Set the ECMAScript target version
+        "module": "commonjs", // Specify module code generation
+        "strict": true,
+        "noImplicitAny": false, // Enable all strict type-checking options
+        "esModuleInterop": true, // Emit additional code to make commonJS and ES modules work together
+        "skipLibCheck": true, // Skip type checking of all declaration files (.d.ts)
+        "forceConsistentCasingInFileNames": true, // Ensure file names are treated with case sensitivity
+        "outDir": "./dist", // Redirect output structure to the 'dist' directory
+        "rootDir": "./src", // Specify the root directory of input files
+        "sourceMap": true, // Create source map files
+        "types": [
+            "node"
+        ], // Add node types
+        "moduleResolution": "node", // Ensure TypeScript resolves modules like Node.js
+    },
+    "include": [
+        "src/**/*" // Include all TypeScript files in the src directory
+    ],
+    "exclude": [
+        "node_modules", // Exclude the node_modules folder
+        "**/*.test.ts" // Exclude test files
+    ]
+}
\ No newline at end of file
diff --git a/apps/remix-ide-e2e/src/githttpbackend/yarn.lock b/apps/remix-ide-e2e/src/githttpbackend/yarn.lock
index 8548a19555..7151d6aded 100644
--- a/apps/remix-ide-e2e/src/githttpbackend/yarn.lock
+++ b/apps/remix-ide-e2e/src/githttpbackend/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+"@types/node@^22.5.4":
+  version "22.5.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.4.tgz#83f7d1f65bc2ed223bdbf57c7884f1d5a4fa84e8"
+  integrity sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==
+  dependencies:
+    undici-types "~6.19.2"
+
 accepts@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
@@ -15,10 +22,10 @@ array-flatten@1.1.1:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-body-parser@1.20.2, body-parser@^1.20.2:
-  version "1.20.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
-  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+body-parser@1.20.3, body-parser@^1.20.2:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.5"
@@ -28,7 +35,25 @@ body-parser@1.20.2, body-parser@^1.20.2:
     http-errors "2.0.0"
     iconv-lite "0.4.24"
     on-finished "2.4.1"
-    qs "6.11.0"
+    qs "6.13.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
+body-parser@^1.20.3:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
+  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.13.0"
     raw-body "2.5.2"
     type-is "~1.6.18"
     unpipe "1.0.0"
@@ -112,6 +137,11 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
+encodeurl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
+  integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
+
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -134,37 +164,37 @@ etag@~1.8.1:
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
-express@^4.19.2:
-  version "4.19.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
-  integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
+express@^4.20.0:
+  version "4.20.0"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48"
+  integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.20.2"
+    body-parser "1.20.3"
     content-disposition "0.5.4"
     content-type "~1.0.4"
     cookie "0.6.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "2.0.0"
-    encodeurl "~1.0.2"
+    encodeurl "~2.0.0"
     escape-html "~1.0.3"
     etag "~1.8.1"
     finalhandler "1.2.0"
     fresh "0.5.2"
     http-errors "2.0.0"
-    merge-descriptors "1.0.1"
+    merge-descriptors "1.0.3"
     methods "~1.1.2"
     on-finished "2.4.1"
     parseurl "~1.3.3"
-    path-to-regexp "0.1.7"
+    path-to-regexp "0.1.10"
     proxy-addr "~2.0.7"
     qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.18.0"
-    serve-static "1.15.0"
+    send "0.19.0"
+    serve-static "1.16.0"
     setprototypeof "1.2.0"
     statuses "2.0.1"
     type-is "~1.6.18"
@@ -292,10 +322,10 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-merge-descriptors@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+merge-descriptors@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
+  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
 
 methods@~1.1.2:
   version "1.1.2"
@@ -351,10 +381,10 @@ parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-path-to-regexp@0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+path-to-regexp@0.1.10:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b"
+  integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==
 
 path@^0.12.7:
   version "0.12.7"
@@ -384,6 +414,13 @@ qs@6.11.0:
   dependencies:
     side-channel "^1.0.4"
 
+qs@6.13.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
+  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+  dependencies:
+    side-channel "^1.0.6"
+
 range-parser@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
@@ -428,10 +465,29 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serve-static@1.15.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
-  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
+send@0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
+  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+  dependencies:
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
+
+serve-static@1.16.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92"
+  integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
@@ -455,7 +511,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-side-channel@^1.0.4:
+side-channel@^1.0.4, side-channel@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
   integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
@@ -483,6 +539,16 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typescript@^5.6.2:
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.2.tgz#d1de67b6bef77c41823f822df8f0b3bcff60a5a0"
+  integrity sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==
+
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
diff --git a/apps/remix-ide-e2e/src/tests/ballot.test.ts b/apps/remix-ide-e2e/src/tests/ballot.test.ts
index c9fb7c27bc..db34e18cf3 100644
--- a/apps/remix-ide-e2e/src/tests/ballot.test.ts
+++ b/apps/remix-ide-e2e/src/tests/ballot.test.ts
@@ -102,6 +102,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_remix_default')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_remix_default' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(1000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
diff --git a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
index da38485359..1b361b3591 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
@@ -16,22 +16,45 @@ module.exports = {
     'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
         browser.
             clickLaunchIcon('dgit')
+            .pause(1000)
             .waitForElementVisible('*[data-id="initgit-btn"]')
             .click('*[data-id="initgit-btn"]')
+            .waitForElementNotPresent('*[data-id="initgit-btn"]')
+    },
+    'launch github login via FE #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+            .click('*[data-id="filepanel-login-github"]')
+    },
+    'login to github #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
             .setValue('*[data-id="githubToken"]', process.env.dgit_token)
+            .pause(1000)
             .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
             .click('*[data-id="saveGitHubCredentials"]')
     },
     'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
-        browser.
-            click('*[data-id="github-panel"]')
+        browser
             .waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
             .waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
             .waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
+    },
+    'check the FE for the auth user #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="filepanel-connected-img-bunsenstraat"]')
     },
     'clone a repository #group1': function (browser: NightwatchBrowser) {
         browser
+            .clickLaunchIcon('dgit')
             .click('*[data-id="clone-panel"]')
             .click({
                 selector: '//*[@data-id="clone-panel-content"]//*[@data-id="fetch-repositories"]',
@@ -101,6 +124,7 @@ module.exports = {
 
             .click('*[data-id="remotes-panel"]')
             .waitForElementVisible('*[data-id="remotes-panel-content"]')
+            .pause(2000)
             .waitForElementVisible({
                 selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-detail-origin-default"]',
                 locateStrategy: 'xpath'
@@ -191,10 +215,27 @@ module.exports = {
                 locateStrategy: 'xpath'
             })
     },
-
+    'disconnect github #group1': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="disconnect-github"]')
+            .pause(1000)
+            .click('*[data-id="disconnect-github"]')
+            .waitForElementNotPresent('*[data-id="connected-as-bunsenstraat"]')
+    },
+    'check the FE for the disconnected auth user #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementNotPresent('*[data-id="filepanel-connected-img-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+    },
     'add a remote #group2': function (browser: NightwatchBrowser) {
         browser
             .pause(1000)
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
             .click('*[data-id="remotes-panel"]')
             .click({
                 selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="fetch-repositories"]',
@@ -253,6 +294,7 @@ module.exports = {
                 selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'main')]",
                 locateStrategy: 'xpath'
             })
+            .pause(1000)
             .getAttribute({
                 selector: '//*[@data-id="sourcecontrol-pull"]',
                 locateStrategy: 'xpath'
@@ -310,4 +352,76 @@ module.exports = {
                 }
             })
     },
+    // pagination test
+    'clone repo #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="clone-panel"]')
+            .click('*[data-id="clone-panel"]')
+            .waitForElementVisible('*[data-id="clone-url"]')
+            .setValue('*[data-id="clone-url"]', 'https://github.com/ethereum/awesome-remix')
+            .waitForElementVisible('*[data-id="clone-branch"]')
+            .setValue('*[data-id="clone-branch"]', 'master')
+            .waitForElementVisible('*[data-id="clone-btn"]')
+            .click('*[data-id="clone-btn"]')
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'Update settings for git #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="githubToken"]', 'invalidtoken')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .pause(1000)
+            .modalFooterOKClick('github-credentials-error')
+    },
+    'check the commits panel for pagination #group3': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="commits-panel"]')
+            .click('*[data-id="commits-panel"]')
+            .elements('xpath', '//*[@data-id="commits-current-branch-master"]//*[@data-type="commit-summary"]', function (result) {
+                console.log('Number of commit-summary elements:', (result.value as any).length);
+                browser.assert.ok((result.value as any).length == 1)
+            })
+    },
+    'load more commits #group3': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="load-more-commits"]')
+            .click('*[data-id="load-more-commits"]')
+            .waitForElementVisible('*[data-id="loader-indicator"]')
+            .waitForElementNotPresent('*[data-id="loader-indicator"]')
+            .elements('xpath', '//*[@data-id="commits-current-branch-master"]//*[@data-type="commit-summary"]', function (result) {
+                console.log('Number of commit-summary elements:', (result.value as any).length);
+                browser.assert.ok((result.value as any).length > 2)
+            })
+    },
+    'load more branches from remote #group3': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible({
+                selector: '//*[@data-id="branches-panel-content-remote-branches"]',
+                locateStrategy: 'xpath'
+            })
+            .elements('xpath', '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-type="branches-branch"]', function (result) {
+                console.log('Number of branches elements:', (result.value as any).length);
+                browser.assert.ok((result.value as any).length == 1)
+            })
+            .waitForElementVisible('*[data-id="remote-sync-origin"]')
+            .click('*[data-id="remote-sync-origin"]')
+            .waitForElementVisible('*[data-id="loader-indicator"]')
+            .waitForElementNotPresent('*[data-id="loader-indicator"]')
+            .elements('xpath', '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-type="branches-branch"]', function (result) {
+                console.log('Number of branches elements:', (result.value as any).length);
+                browser.assert.ok((result.value as any).length > 2)
+            })
+    }
 }
diff --git a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
index b6ee642a27..a20624a37c 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
@@ -36,6 +36,10 @@ module.exports = {
             clickLaunchIcon('dgit')
             .waitForElementVisible('*[data-id="initgit-btn"]')
             .click('*[data-id="initgit-btn"]')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
             .setValue('*[data-id="gitubUsername"]', 'git')
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
             .click('*[data-id="saveGitHubCredentials"]')
@@ -603,7 +607,7 @@ async function createCommitOnLocalServer(path: string, message: string) {
 async function spawnGitServer(path: string): Promise<ChildProcess> {
     console.log(process.cwd())
     try {
-        const server = spawn('yarn && sh setup.sh && npx ts-node server.ts', [`${path}`], { cwd: process.cwd() + '/apps/remix-ide-e2e/src/githttpbackend/', shell: true, detached: true })
+        const server = spawn('yarn && sh setup.sh && yarn start:server', [`${path}`], { cwd: process.cwd() + '/apps/remix-ide-e2e/src/githttpbackend/', shell: true, detached: true })
         console.log('spawned', server.stdout.closed, server.stderr.closed)
         return new Promise((resolve, reject) => {
             server.stdout.on('data', function (data) {
diff --git a/apps/remix-ide-e2e/src/tests/editorHoverContext.test.ts b/apps/remix-ide-e2e/src/tests/editorHoverContext.test.ts
index 2fb98cc339..2b130875e3 100644
--- a/apps/remix-ide-e2e/src/tests/editorHoverContext.test.ts
+++ b/apps/remix-ide-e2e/src/tests/editorHoverContext.test.ts
@@ -90,6 +90,8 @@ module.exports = {
         browser
         .clickLaunchIcon('solidity')
         .setSolidityCompilerVersion('soljson-v0.8.20+commit.a1b79de6.js')
+        .click('*[data-id="scConfigExpander"]')
+        .setValue('#evmVersionSelector', 'berlin') // set target EVM for parser to berlin
         .addFile('contracts/mytoken.sol', {
             content: myToken
         }).useXpath().waitForElementVisible("//*[@class='view-line' and contains(.,'gas')]")
diff --git a/apps/remix-ide-e2e/src/tests/eip1153.test.ts b/apps/remix-ide-e2e/src/tests/eip1153.test.ts
index 1f8598c49c..9a5fae289c 100644
--- a/apps/remix-ide-e2e/src/tests/eip1153.test.ts
+++ b/apps/remix-ide-e2e/src/tests/eip1153.test.ts
@@ -31,7 +31,21 @@ module.exports = {
             1: 'uint256: out2 15'
           }
         })
-     .end()
+  },
+
+  'Should clear transient storage after tx execution #group1' : function (browser: NightwatchBrowser) {
+    browser.addFile('clear_transient.sol', { content: clearTransient })
+    .verifyContracts(['ClearTransient'])
+    .clickLaunchIcon('udapp')
+    .createContract('')
+    .clickInstance(1)
+    .clickFunction('get - call')
+    .testFunction('last',
+      {
+        'decoded output': {
+          0: 'uint256: 0'
+        }
+      })
   }
 }
 
@@ -49,3 +63,22 @@ contract TestTransientStorage {
         }
     }    
 }`
+
+const clearTransient = `
+// SPDX-License-Identifier: none
+pragma solidity 0.8.26;
+import "hardhat/console.sol"; 
+   
+contract ClearTransient {
+    uint p;
+    constructor() {
+      uint256 value;
+      assembly { value := tload(hex"1234") }
+      p = value;
+      assembly { tstore(hex"1234", 10)  }       
+    }
+
+    function get () public view returns (uint) {
+      return p;
+    }
+}`
diff --git a/apps/remix-ide-e2e/src/tests/erc721.test.ts b/apps/remix-ide-e2e/src/tests/erc721.test.ts
index 890a5e7fc3..8a3861a1c8 100644
--- a/apps/remix-ide-e2e/src/tests/erc721.test.ts
+++ b/apps/remix-ide-e2e/src/tests/erc721.test.ts
@@ -22,6 +22,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_erc721')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_erc721' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
diff --git a/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts b/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts
index 214217af38..6b07aa123b 100644
--- a/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts
+++ b/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts
@@ -43,19 +43,20 @@ module.exports = {
             (el: any) => {
               const id = (el as any).value.getId()
               browser
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemtests"]')
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemtests"]', abortOnFailure: false })
                 .dragAndDrop('li[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]', id)
-                .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+                .waitForElementPresent({ selector: '[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok', abortOnFailure: false })
                 .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemtests/1_Storage.sol"]')
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemtests/2_Owner.sol"]')
-                .waitForElementNotPresent('li[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
-                .waitForElementNotPresent('li[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemtests/1_Storage.sol"]', abortOnFailure: false })
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemtests/2_Owner.sol"]', abortOnFailure: false })
+                .waitForElementNotPresent({ selector: 'li[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]', abortOnFailure: false })
+                .waitForElementNotPresent({ selector: 'li[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]', abortOnFailure: false })
                 .perform(() => done())
             })
         })
     }
   },
+
   'should drag and drop multiple files and folders in file explorer to contracts folder #group3': function (browser: NightwatchBrowser) {
     const selectedElements = []
     if (browser.options.desiredCapabilities?.browserName === 'firefox') {
@@ -79,15 +80,15 @@ module.exports = {
             (el: any) => {
               const id = (el as any).value.getId()
               browser
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts"]')
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemcontracts"]', abortOnFailure: false })
                 .dragAndDrop('li[data-id="treeViewLitreeViewItemtests"]', id)
-                .waitForElementPresent('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok')
+                .waitForElementPresent({ selector: '[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok', abortOnFailure: false })
                 .execute(function () { (document.querySelector('[data-id="fileSystemModalDialogModalFooter-react"] .modal-ok') as HTMLElement).click() })
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/tests"]', 5000)
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/README.txt"]', 5000)
-                .waitForElementVisible('li[data-id="treeViewLitreeViewItemcontracts/scripts"]', 5000)
-                .waitForElementNotPresent('li[data-id="treeViewLitreeViewItemtests"]')
-                .waitForElementNotPresent('li[data-id="treeViewLitreeViewItemREADME.txt"]')
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemcontracts/tests"]', abortOnFailure: false })
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemcontracts/README.txt"]', abortOnFailure: false })
+                .waitForElementVisible({ selector: 'li[data-id="treeViewLitreeViewItemcontracts/scripts"]', abortOnFailure: false })
+                .waitForElementNotPresent({ selector: 'li[data-id="treeViewLitreeViewItemtests"]', abortOnFailure: false })
+                .waitForElementNotPresent({ selector: 'li[data-id="treeViewLitreeViewItemREADME.txt"]', abortOnFailure: false })
                 .perform(() => done())
             })
         })
diff --git a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
index 91ef7d6a4f..8fd8ff3b68 100644
--- a/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
+++ b/apps/remix-ide-e2e/src/tests/solidityUnittests.test.ts
@@ -246,13 +246,13 @@ module.exports = {
       .waitForElementPresent('#solidityUnittestsOutput div[class^="testPass"]', 60000)
       .waitForElementContainsText('#solidityUnittestsOutput', 'tests/hhLogs_test.sol', 60000)
       .pause(2000)
-      .assert.containsText('#journal > div:nth-child(4) > span', 'Before all:')
-      .assert.containsText('#journal > div:nth-child(4) > span', 'Inside beforeAll')
-      .assert.containsText('#journal > div:nth-child(5) > span', 'Check sender:')
-      .assert.containsText('#journal > div:nth-child(5) > span', 'msg.sender is 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4')
-      .assert.containsText('#journal > div:nth-child(6) > span', 'Check int logs:')
-      .assert.containsText('#journal > div:nth-child(6) > span', '10 20')
-      .assert.containsText('#journal > div:nth-child(6) > span', 'Number is 25')
+      .assert.textContains('#journal > div:nth-child(3) > span', 'Before all:')
+      .assert.textContains('#journal > div:nth-child(3) > span', 'Inside beforeAll')
+      .assert.textContains('#journal > div:nth-child(4) > span', 'Check sender:')
+      .assert.textContains('#journal > div:nth-child(4) > span', 'msg.sender is 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4')
+      .assert.textContains('#journal > div:nth-child(5) > span', 'Check int logs:')
+      .assert.textContains('#journal > div:nth-child(5) > span', '10 20')
+      .assert.textContains('#journal > div:nth-child(5) > span', 'Number is 25')
       .openFile('tests/hhLogs_test.sol')
       .removeFile('tests/hhLogs_test.sol', 'workspace_new')
   },
diff --git a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
index 1174b58fc6..717edd43c9 100644
--- a/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
+++ b/apps/remix-ide-e2e/src/tests/vyper_api.test.ts
@@ -17,13 +17,13 @@ module.exports = {
     browser.clickLaunchIcon('pluginManager')
       .scrollAndClick('[data-id="pluginManagerComponentActivateButtonvyper"]')
       .clickLaunchIcon('vyper')
-      .pause(5000)
-      // @ts-ignore
       .frame(0)
   },
 
   'Should clone the Vyper repo #group1': function (browser: NightwatchBrowser) {
-    browser.click('button[data-id="add-repository"]')
+    browser
+      .waitForElementVisible('button[data-id="add-repository"]')
+      .click('button[data-id="add-repository"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
       .waitForElementVisible({
@@ -31,11 +31,10 @@ module.exports = {
         locateStrategy: 'xpath',
         timeout: 120000
       })
-      .currentWorkspaceIs('snekmate')
       .waitForElementVisible({
-        selector: "//*[@data-id='treeViewLitreeViewItemsrc' and contains(.,'src')]",
+        selector: "//*[contains(., 'Vyper repository cloned')]",
         locateStrategy: 'xpath',
-        timeout: 1200000
+        timeout: 120000
       })
   },
   // 'Add vyper file to run tests #group1': function (browser: NightwatchBrowser) {
@@ -123,6 +122,7 @@ module.exports = {
       .clickLaunchIcon('vyper')
       // @ts-ignore
       .frame(0)
+      .waitForElementVisible('[data-id="compile"]')
       .click('[data-id="compile"]')
       .waitForElementVisible({
         selector:'[data-id="compilation-details"]',
diff --git a/apps/remix-ide-e2e/src/tests/workspace.test.ts b/apps/remix-ide-e2e/src/tests/workspace.test.ts
index 094b35a080..e9517e90e2 100644
--- a/apps/remix-ide-e2e/src/tests/workspace.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace.test.ts
@@ -43,6 +43,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_remix_default')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_remix_default' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(1000)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
@@ -115,6 +117,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_blank')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_blank' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
       .waitForElementPresent('*[data-id="treeViewUltreeViewMenu"]')
@@ -136,6 +140,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_erc20')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_erc20' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
@@ -195,6 +201,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_erc721')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_erc721' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
@@ -254,6 +262,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_erc1155')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_erc1155' })
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
@@ -484,6 +494,7 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'sometestworkspace')
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'sometestworkspace' })
       .modalFooterOKClick('TemplatesSelection')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/MyToken.sol"]')
@@ -510,6 +521,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_db_test')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_db_test' })
       .modalFooterOKClick('TemplatesSelection')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/MyToken.sol"]')
@@ -538,6 +551,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'multisig cookbook')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'multisig cookbook' })
       .modalFooterOKClick('TemplatesSelection')
       .waitForElementVisible('[data-id="PermissionHandler-modal-footer-ok-react"]', 300000)
       .click('[data-id="PermissionHandler-modal-footer-ok-react"]')
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 0661eb31ee..c495ce11b8 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -53,6 +53,8 @@ module.exports = {
       .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
       .scrollAndClick('*[data-id="modalDialogCustomPromptTextCreate"]')
       .setValue('*[data-id="modalDialogCustomPromptTextCreate"]', 'workspace_blank')
+      // eslint-disable-next-line dot-notation
+      .execute(function () { document.querySelector('*[data-id="modalDialogCustomPromptTextCreate"]')['value'] = 'workspace_blank' })
       .click('[data-id="initGitRepositoryLabel"]')
       .modalFooterOKClick('TemplatesSelection')
       .pause(100)
@@ -179,7 +181,7 @@ module.exports = {
       .waitForElementVisible('[data-id="workspaceGitPanel"]')
       .waitForElementVisible('[data-id="workspaceGitBranchesDropdown"]')
       .click('[data-id="workspaceGitBranchesDropdown"]')
-      .pause()
+      .pause(1000)
       .waitForElementVisible('[data-id="custom-dropdown-menu"]')
       .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/dev')
       .waitForElementContainsText('[data-id="custom-dropdown-items"]', 'origin/production')
@@ -402,7 +404,7 @@ module.exports = {
       .getEditorValue((content) => {
         browser.assert.ok(content.indexOf(`contract Counter is BaseHook {`) !== -1,
           'Incorrect content')
-      }).pause()
+      })
   },
 
   'Should create Remix default workspace with files #group5': function (browser: NightwatchBrowser) {
@@ -423,6 +425,10 @@ module.exports = {
       clickLaunchIcon('dgit')
       .waitForElementVisible('*[data-id="initgit-btn"]')
       .click('*[data-id="initgit-btn"]')
+      .waitForElementVisible('*[data-id="github-panel"]')
+      .pause(1000)
+      .click('*[data-id="github-panel"]')
+      .waitForElementVisible('*[data-id="gitubUsername"]')
       .setValue('*[data-id="gitubUsername"]', 'git')
       .setValue('*[data-id="githubEmail"]', 'git@example.com')
       .click('*[data-id="saveGitHubCredentials"]')
@@ -430,6 +436,8 @@ module.exports = {
   },
   'check source controle panel #group5': function (browser: NightwatchBrowser) {
     browser
+      .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+      .click('*[data-id="sourcecontrol-panel"]')
       .waitForElementVisible({
         selector: "//*[@data-status='new-untracked' and @data-file='/tests/MyToken_test.sol']",
         locateStrategy: 'xpath'
diff --git a/apps/remix-ide/ci/downloadsoljson.sh b/apps/remix-ide/ci/downloadsoljson.sh
index 4d3d93932f..ac477d469f 100644
--- a/apps/remix-ide/ci/downloadsoljson.sh
+++ b/apps/remix-ide/ci/downloadsoljson.sh
@@ -4,7 +4,7 @@ echo "Downloading specified soljson.js version based on defaultVersion in packag
 
 set -e
 
-# Check if curl and jq are installed
+# Check if curl is installed
 if ! command -v curl &> /dev/null; then
     echo "curl could not be found"
     exit 1
@@ -14,32 +14,38 @@ fi
 defaultVersion=$(grep '"defaultVersion"' package.json | awk -F '"' '{print $4}')
 echo "Specified version from package.json: $defaultVersion"
 
-# Download the list.json file containing available versions
-curl -s https://binaries.soliditylang.org/wasm/list.json > list.json
+# Fetch the list.json from the Solidity binaries
+listJson=$(curl -s --connect-timeout 5 --max-time 5 https://binaries.soliditylang.org/wasm/list.json)
+
+# Check if the download was successful
+if [ -z "$listJson" ]; then
+    echo "Failed to fetch version list. No internet connection or the connection is too slow."
+    exit 0  # Silently exit
+fi
+
+# Overwrite the local list.json with the fetched content
+echo "$listJson" > ./apps/remix-ide/src/assets/list.json
+
+# Check if the specified version exists in the list
+check=$(echo "$listJson" | grep "\"$defaultVersion\"")
 
-# Use jq to extract the path for the specified version from the builds array
-check=$(grep "\"$defaultVersion\"" list.json)
 if [ -z "$check" ]; then
     echo "The specified version $defaultVersion could not be found in the list"
     exit 1
 fi
-
 echo "Path for the specified version: $defaultVersion"
 fullPath="https://binaries.soliditylang.org/bin/$defaultVersion"
 echo "Download fullPath: $fullPath"
-
 # Ensure the target directory exists
 if [ ! -d "./apps/remix-ide/src/assets/js/soljson" ]; then
     mkdir -p ./apps/remix-ide/src/assets/js/soljson
 fi
 
-# Download the file to ./apps/remix-ide/src/assets/js/soljson.js
-echo "Downloading soljson.js from "$fullPath" to ./apps/remix-ide/src/assets/js/soljson.js"
+# Download the soljson.js file to ./apps/remix-ide/src/assets/js/soljson.js
+echo "Downloading soljson.js from $fullPath to ./apps/remix-ide/src/assets/js/soljson.js"
 curl -s "$fullPath" > ./apps/remix-ide/src/assets/js/soljson.js
 
 # Copy the downloaded soljson.js to the specific version directory
-cp ./apps/remix-ide/src/assets/js/soljson.js "./apps/remix-ide/src/assets/js/soljson/$path"
-cp list.json ./apps/remix-ide/src/assets/list.json
+cp ./apps/remix-ide/src/assets/js/soljson.js "./apps/remix-ide/src/assets/js/soljson/$defaultVersion.js"
 
-# Clean up by removing the list.json
-rm list.json
+echo "Download and setup of soljson.js complete"
diff --git a/apps/remix-ide/src/app/components/vertical-icons.tsx b/apps/remix-ide/src/app/components/vertical-icons.tsx
index eb5ea60863..865c4fa468 100644
--- a/apps/remix-ide/src/app/components/vertical-icons.tsx
+++ b/apps/remix-ide/src/app/components/vertical-icons.tsx
@@ -16,8 +16,6 @@ const profile = {
   events: ['toggleContent', 'showContent']
 }
 
-const toMaximize = ['LearnEth']
-
 export class VerticalIcons extends Plugin {
   events: EventEmitter
   htmlElement: HTMLDivElement
@@ -128,11 +126,6 @@ export class VerticalIcons extends Plugin {
     // TODO: Only keep `this.emit` (issue#2210)
     this.emit('showContent', name)
     this.events.emit('showContent', name)
-    if (toMaximize.includes(name)) {
-      setTimeout(_ => {
-        this.call('layout', 'maximiseSidePanel')
-      }, 500)
-    }
   }
 
   /**
diff --git a/apps/remix-ide/src/app/files/dgitProvider.ts b/apps/remix-ide/src/app/files/dgitProvider.ts
index 87cb4c3c8c..cdb863b4b7 100644
--- a/apps/remix-ide/src/app/files/dgitProvider.ts
+++ b/apps/remix-ide/src/app/files/dgitProvider.ts
@@ -4,26 +4,16 @@ import {
   Plugin
 } from '@remixproject/engine'
 import git, { ReadBlobResult, ReadCommitResult, StatusRow } from 'isomorphic-git'
-import IpfsHttpClient from 'ipfs-http-client'
-import {
-  saveAs
-} from 'file-saver'
-import http from 'isomorphic-git/http/web'
-
-import JSZip from 'jszip'
 import path from 'path'
-import FormData from 'form-data'
 import axios from 'axios'
 import { Registry } from '@remix-project/remix-lib'
-import { Octokit, App } from "octokit"
-import { OctokitResponse } from '@octokit/types'
-import { Endpoints } from "@octokit/types"
+import { Octokit } from "octokit"
 import { IndexedDBStorage } from './filesystems/indexedDB'
-import { GitHubUser, branch, commitChange, remote, pagedCommits, remoteCommitsInputType, cloneInputType, fetchInputType, pullInputType, pushInputType, currentBranchInput, branchInputType, addInput, rmInput, resolveRefInput, readBlobInput, repositoriesInput, commitInput, branchDifference, compareBranchesInput, initInput, userEmails, checkoutInput } from '@remix-ui/git'
-import { LibraryProfile, StatusEvents } from '@remixproject/plugin-utils'
-import { ITerminal } from '@remixproject/plugin-api/src/lib/terminal'
-import { partial } from 'lodash'
-
+import { branch, commitChange, remote } from '@remix-ui/git'
+import { checkoutInputType, statusInput, logInputType, author, pagedCommits, remoteCommitsInputType, cloneInputType, fetchInputType, pullInputType, pushInputType, currentBranchInput, branchInputType, addInputType, rmInputType, resolveRefInput, readBlobInput, repositoriesInput, commitInputType, branchDifference, compareBranchesInput, initInputType, isoGitFSConfig, GitHubUser, userEmails } from '@remix-api'
+import { LibraryProfile } from '@remixproject/plugin-utils'
+import { CustomRemixApi } from '@remix-api'
+import { isoGit } from "@remix-git"
 declare global {
   interface Window { remixFileSystemCallback: IndexedDBStorage; remixFileSystem: any; }
 }
@@ -34,49 +24,17 @@ const profile: LibraryProfile = {
   description: 'Decentralized git provider',
   icon: 'assets/img/fileManager.webp',
   version: '0.0.1',
-  methods: ['init', 'localStorageUsed', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'export', 'import', 'status', 'log', 'commit', 'add', 'remove', 'reset', 'rm', 'lsfiles', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pull', 'setIpfsConfig', 'zip', 'setItem', 'getItem', 'version', 'updateSubmodules'
+  methods: ['init', 'addremote', 'delremote', 'remotes', 'fetch', 'clone', 'status', 'log', 'commit', 'add', 'remove', 'rm', 'readblob', 'resolveref', 'branches', 'branch', 'checkout', 'currentbranch', 'push', 'pull', 'version', 'updateSubmodules'
     , 'getGitHubUser', 'remotebranches', 'remotecommits', 'repositories', 'getCommitChanges', 'compareBranches'],
   kind: 'file-system'
 }
-class DGitProvider extends Plugin {
-  ipfsconfig: { host: string; port: number; protocol: string; ipfsurl: string }
-  globalIPFSConfig: { host: string; port: number; protocol: string; ipfsurl: string }
-  remixIPFS: { host: string; port: number; protocol: string; ipfsurl: string }
-  ipfsSources: any[]
-  ipfs: any
-  filesToSend: any[]
+class DGitProvider extends Plugin<any, CustomRemixApi> {
   constructor() {
     super(profile)
-    this.ipfsconfig = {
-      host: 'jqgt.remixproject.org',
-      port: 443,
-      protocol: 'https',
-      ipfsurl: 'https://jqgt.remixproject.org/ipfs/'
-    }
-    this.globalIPFSConfig = {
-      host: 'ipfs.io',
-      port: 443,
-      protocol: 'https',
-      ipfsurl: 'https://ipfs.io/ipfs/'
-    }
-    this.remixIPFS = {
-      host: 'jqgt.remixproject.org',
-      port: 443,
-      protocol: 'https',
-      ipfsurl: 'https://jqgt.remixproject.org/ipfs/'
-    }
-    this.ipfsSources = [this.remixIPFS, this.globalIPFSConfig, this.ipfsconfig]
   }
 
   async addIsomorphicGitConfigFS(dir = '') {
 
-    if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return {
-        fs: window.remixFileSystem,
-        dir: '/'
-      }
-    }
-
     const workspace = await this.call('filePanel', 'getCurrentWorkspace')
 
     if (!workspace) return
@@ -86,62 +44,12 @@ class DGitProvider extends Plugin {
     }
   }
 
-  async addIsomorphicGitConfig(input) {
-
-    const token = await this.call('config' as any, 'getAppParameter', 'settings/gist-access-token')
-
-    let config = {
-      corsProxy: 'https://corsproxy.remixproject.org/',
-      http,
-      onAuth: url => {
-        url
-        const auth = {
-          username: input.token || token,
-          password: ''
-        }
-        return auth
-      }
-    }
-    if (input.url) {
-
-      const url = new URL(input.url)
-      if (url.hostname.includes('localhost')) {
-        config = {
-          ...config,
-          corsProxy: null
-        }
-      }
-    }
-    if ((input.remote && input.remote.url)) {
-
-      const url = new URL(input.remote.url)
-      if (url.hostname.includes('localhost')) {
-        config = {
-          ...config,
-          corsProxy: null,
-        }
-      }
-    }
-
-    if (input.provider && input.provider === 'github') {
-      config = {
-        ...config,
-        corsProxy: 'https://corsproxy.remixproject.org/',
-      }
-    }
-
-    if (input.provider && input.provider === 'localhost') {
-      config = {
-        ...config,
-        corsProxy: null
-      }
-    }
-
-    return config
+  async getToken() {
+    return await this.call('config' as any, 'getAppParameter', 'settings/gist-access-token')
   }
 
-  async getCommandUser(input) {
-    const author = {
+  async getAuthor(input) {
+    const author: author = {
       name: '',
       email: ''
     }
@@ -167,7 +75,7 @@ class DGitProvider extends Plugin {
     return author
   }
 
-  async init(input?: initInput): Promise<void> {
+  async init(input?: initInputType): Promise<void> {
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       await this.call('isogit', 'init', {
         defaultBranch: (input && input.defaultBranch) || 'main'
@@ -192,11 +100,10 @@ class DGitProvider extends Plugin {
     return version
   }
 
-  async status(cmd): Promise<Array<StatusRow>> {
+  async status(cmd: statusInput): Promise<Array<StatusRow>> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       const status = await this.call('isogit', 'status', cmd)
-
       return status
     }
 
@@ -208,7 +115,7 @@ class DGitProvider extends Plugin {
     return status
   }
 
-  async add(cmd: addInput): Promise<void> {
+  async add(cmd: addInputType): Promise<void> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       await this.call('isogit', 'add', cmd)
@@ -222,7 +129,7 @@ class DGitProvider extends Plugin {
     this.emit('add')
   }
 
-  async rm(cmd: rmInput) {
+  async rm(cmd: rmInputType) {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       await this.call('isogit', 'rm', cmd)
@@ -231,26 +138,11 @@ class DGitProvider extends Plugin {
         ...await this.addIsomorphicGitConfigFS(),
         ...cmd
       })
-      this.emit('rm')
-
-    }
-  }
-
-  async reset(cmd) {
-
-    if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      await this.call('isogit', 'reset', cmd)
-    } else {
-      await git.resetIndex({
-        ...await this.addIsomorphicGitConfigFS(),
-        ...cmd
-      })
-      this.emit('rm')
-
     }
+    this.emit('rm')
   }
 
-  async checkout(cmd: checkoutInput): Promise<void> {
+  async checkout(cmd: checkoutInputType): Promise<void> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       await this.call('isogit', 'checkout', cmd)
@@ -291,12 +183,11 @@ class DGitProvider extends Plugin {
     this.emit('checkout')
   }
 
-  async log(cmd: { ref: string }): Promise<ReadCommitResult[]> {
+  async log(cmd: logInputType): Promise<ReadCommitResult[]> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       const status = await this.call('isogit', 'log', {
         ...cmd,
-        depth: 10
       })
 
       return status
@@ -306,101 +197,32 @@ class DGitProvider extends Plugin {
       ...await this.addIsomorphicGitConfigFS(),
       ...cmd,
     })
+
     return status
   }
 
   async compareBranches({ branch, remote }: compareBranchesInput): Promise<branchDifference> {
-    // Get current branch commits
-    const headCommits = await git.log({
-      ...await this.addIsomorphicGitConfigFS(),
-      ref: branch.name,
-    });
-
-    // Get remote branch commits
-    const remoteCommits = await git.log({
-      ...await this.addIsomorphicGitConfigFS(),
-      ref: `${remote.name}/${branch.name}`,
-    });
-
-    // Convert arrays of commit objects to sets of commit SHAs
-    const headCommitSHAs = new Set(headCommits.map(commit => commit.oid));
-    const remoteCommitSHAs = new Set(remoteCommits.map(commit => commit.oid));
-
-    // Filter out commits that are only in the remote branch
-    const uniqueRemoteCommits = remoteCommits.filter(commit => !headCommitSHAs.has(commit.oid));
-
-    // filter out commits that are only in the local branch
-    const uniqueHeadCommits = headCommits.filter(commit => !remoteCommitSHAs.has(commit.oid));
-
-    return {
-      uniqueHeadCommits,
-      uniqueRemoteCommits,
-    };
+    if ((Registry.getInstance().get('platform').api.isDesktop())) {
+      return await this.call('isogit', 'compareBranches', { branch, remote })
+    }
+    return await isoGit.compareBranches({ branch, remote }, await this.addIsomorphicGitConfigFS())
   }
 
   async getCommitChanges(commitHash1: string, commitHash2: string): Promise<commitChange[]> {
-    const result: commitChange[] = await git.walk({
-      ...await this.addIsomorphicGitConfigFS(),
-      trees: [git.TREE({ ref: commitHash1 }), git.TREE({ ref: commitHash2 })],
-      map: async function (filepath, [A, B]) {
-
-        if (filepath === '.') {
-          return
-        }
-        try {
-          if ((A && await A.type()) === 'tree' || B && (await B.type()) === 'tree') {
-            return
-          }
-        } catch (e) {
-          // ignore
-        }
-
-        // generate ids
-        const Aoid = A && await A.oid() || undefined
-        const Boid = B && await B.oid() || undefined
-
-        const commitChange: Partial<commitChange> = {
-          hashModified: commitHash1,
-          hashOriginal: commitHash2,
-          path: filepath,
-        }
-
-        // determine modification type
-        if (Aoid !== Boid) {
-          commitChange.type = "modified"
-        }
-        if (Aoid === undefined) {
-          commitChange.type = "deleted"
-        }
-        if (Boid === undefined || !commitHash2) {
-          commitChange.type = "added"
-        }
-        if (Aoid === undefined && Boid === undefined) {
-          commitChange.type = "unknown"
-        }
-        if (commitChange.type)
-          return commitChange
-        else
-          return undefined
-      },
-    })
+    if ((Registry.getInstance().get('platform').api.isDesktop())) {
+      const result = this.call('isogit', 'getCommitChanges', commitHash1, commitHash2)
+      return result
+    }
 
-    return result
+    return await isoGit.getCommitChanges(commitHash1, commitHash2, await this.addIsomorphicGitConfigFS())
   }
 
-  async remotes(config): Promise<remote[]> {
+  async remotes(): Promise<remote[]> {
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return await this.call('isogit', 'remotes', config)
+      return await this.call('isogit', 'remotes')
     }
 
-    let remotes: remote[] = []
-    try {
-      remotes = (await git.listRemotes({ ...config ? config : await this.addIsomorphicGitConfigFS() })).map((remote) => { return { name: remote.remote, url: remote.url } }
-      )
-    } catch (e) {
-      // do nothing
-    }
-    return remotes
+    return await isoGit.remotes(await this.addIsomorphicGitConfigFS())
   }
 
   async branch(cmd: branchInputType): Promise<void> {
@@ -423,68 +245,28 @@ class DGitProvider extends Plugin {
     return status
   }
 
-  async currentbranch(config: currentBranchInput): Promise<branch> {
+  async currentbranch(input: currentBranchInput): Promise<branch> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return await this.call('isogit', 'currentbranch')
+      return await this.call('isogit', 'currentbranch', input)
     }
 
-    try {
-      const defaultConfig = await this.addIsomorphicGitConfigFS()
-      const cmd = config ? defaultConfig ? { ...defaultConfig, ...config } : config : defaultConfig
-      const name = await git.currentBranch(cmd)
-      let remote: remote = undefined
-      try {
-        const remoteName = await git.getConfig({
-          ...defaultConfig,
-          path: `branch.${name}.remote`
-        })
-        if (remoteName) {
-          const remoteUrl = await git.getConfig({
-            ...defaultConfig,
-            path: `remote.${remoteName}.url`
-          })
-          remote = { name: remoteName, url: remoteUrl }
-        }
-
-      } catch (e) {
-        // do nothing
-      }
-
-      return {
-        remote: remote,
-        name: name || ''
-      }
-    } catch (e) {
-      return undefined
-    }
+    const defaultConfig = await this.addIsomorphicGitConfigFS()
+    return await isoGit.currentbranch(input, defaultConfig)
   }
 
-  async branches(config): Promise<branch[]> {
+  async branches(config: isoGitFSConfig): Promise<branch[]> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return await this.call('isogit', 'branches')
-    }
-
-    try {
-      const defaultConfig = await this.addIsomorphicGitConfigFS()
-      const cmd = config ? defaultConfig ? { ...defaultConfig, ...config } : config : defaultConfig
-      const remotes = await this.remotes(config)
-      let branches: branch[] = []
-      branches = (await git.listBranches(cmd)).map((branch) => { return { remote: undefined, name: branch } })
-      for (const remote of remotes) {
-        cmd.remote = remote.name
-        const remotebranches = (await git.listBranches(cmd)).map((branch) => { return { remote: remote, name: branch } })
-        branches = [...branches, ...remotebranches]
-      }
+      const branches = await this.call('isogit', 'branches')
       return branches
-    } catch (e) {
-      console.log(e)
-      return []
     }
+    const defaultConfig = await this.addIsomorphicGitConfigFS()
+    const cmd = config ? defaultConfig ? { ...defaultConfig, ...config } : config : defaultConfig
+    return await isoGit.branches(cmd)
   }
 
-  async commit(cmd: commitInput): Promise<string> {
+  async commit(cmd: commitInputType): Promise<string> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
       try {
@@ -511,19 +293,6 @@ class DGitProvider extends Plugin {
     }
   }
 
-  async lsfiles(cmd) {
-
-    if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return await this.call('isogit', 'lsfiles', cmd)
-    }
-
-    const filesInStaging = await git.listFiles({
-      ...await this.addIsomorphicGitConfigFS(),
-      ...cmd
-    })
-    return filesInStaging
-  }
-
   async resolveref(cmd: resolveRefInput): Promise<string> {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
@@ -550,26 +319,9 @@ class DGitProvider extends Plugin {
     return readBlobResult
   }
 
-  async setIpfsConfig(config) {
-    this.ipfsconfig = config
-    return new Promise((resolve) => {
-      resolve(this.checkIpfsConfig())
-    })
-  }
-
-  async checkIpfsConfig(config?) {
-    this.ipfs = IpfsHttpClient(config || this.ipfsconfig)
-    try {
-      await this.ipfs.config.getAll()
-      return true
-    } catch (e) {
-      return false
-    }
-  }
-
   async addremote(input: remote): Promise<void> {
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      await this.call('isogit', 'addremote', { url: input.url, remote: input.name })
+      await this.call('isogit', 'addremote', input)
       return
     }
     await git.addRemote({ ...await this.addIsomorphicGitConfigFS(), url: input.url, remote: input.name })
@@ -577,51 +329,39 @@ class DGitProvider extends Plugin {
 
   async delremote(input: remote) {
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      await this.call('isogit', 'delremote', { remote: input.name })
+      await this.call('isogit', 'delremote', input)
       return
     }
     await git.deleteRemote({ ...await this.addIsomorphicGitConfigFS(), remote: input.name })
   }
 
-  async localStorageUsed() {
-    return this.calculateLocalStorage()
-  }
-
   async clone(input: cloneInputType) {
 
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      const folder = await this.call('fs', 'selectFolder', null, 'Select or create a folder to clone the repository in', 'Select as Repository Destination')
-      if (!folder) return false
-      const cmd = {
-        url: input.url,
-        singleBranch: input.singleBranch,
-        ref: input.branch,
-        depth: input.depth || 10,
-        dir: folder,
-        input
-      }
-      this.call('terminal', 'logHtml', `Cloning ${input.url}... please wait...`)
       try {
-        const result = await this.call('isogit', 'clone', cmd)
-        this.call('fs', 'openWindow', folder)
-        return result
+        const folder = await this.call('fs', 'selectFolder', null, 'Select or create a folder to clone the repository in', 'Select as Repository Destination')
+        if (!folder) return false
+        input.dir = folder
+        input.depth = input.depth || 10
+        const result = await this.call('isogit', 'clone', input)
+        this.call('fs' as any, 'openWindow', folder)
       } catch (e) {
         this.call('notification', 'alert', {
           id: 'dgitAlert',
+          title: 'Error Cloning',
           message: 'Unexpected error while cloning the repository: \n' + e.toString(),
         })
       }
     } else {
       const permission = await this.askUserPermission('clone', 'Import multiple files into your workspaces.')
       if (!permission) return false
-      if (parseFloat(this.calculateLocalStorage()) > 10000) throw new Error('The local storage of the browser is full.')
       if (!input.workspaceExists) await this.call('filePanel', 'createWorkspace', input.workspaceName || `workspace_${Date.now()}`, true)
       const cmd = {
         url: input.url,
         singleBranch: input.singleBranch,
         ref: input.branch,
         depth: input.depth || 10,
-        ...await this.addIsomorphicGitConfig(input),
+        ...await isoGit.addIsomorphicGitProxyConfig(input, this),
         ...await this.addIsomorphicGitConfigFS()
       }
       this.call('terminal', 'logHtml', `Cloning ${input.url}... please wait...`)
@@ -674,6 +414,9 @@ class DGitProvider extends Plugin {
   }
 
   async updateSubmodules(input) {
+    if ((Registry.getInstance().get('platform').api.isDesktop())) {
+      return await this.call('isogit', 'updateSubmodules', null)
+    }
     try {
       const currentDir = (input && input.dir) || ''
       const gitmodules = await this.parseGitmodules(currentDir)
@@ -705,10 +448,10 @@ class DGitProvider extends Plugin {
               url: module.url,
               singleBranch: true,
               depth: 1,
-              ...await this.addIsomorphicGitConfig({
+              ...await isoGit.addIsomorphicGitProxyConfig({
                 ...input,
-                provider: 'github'
-              }),
+                provider: 'github',
+              }, this),
               ...await this.addIsomorphicGitConfigFS(dir)
             }
             this.call('terminal', 'logHtml', `Cloning submodule ${dir}...`)
@@ -732,10 +475,10 @@ class DGitProvider extends Plugin {
             if (result && result.length) {
               this.call('terminal', 'logHtml', `Checking out submodule ${dir} to ${result[0]} in directory ${dir}`)
               await git.fetch({
-                ...await this.addIsomorphicGitConfig({
+                ...await isoGit.addIsomorphicGitProxyConfig({
                   ...input,
-                  provider: 'github'
-                }),
+                  provider: 'github',
+                }, this),
                 ...await this.addIsomorphicGitConfigFS(dir),
                 singleBranch: true,
                 ref: result[0]
@@ -782,55 +525,22 @@ class DGitProvider extends Plugin {
 
   async push(input: pushInputType) {
 
-    const cmd = {
-      force: input.force,
-      ref: input.ref.name,
-      remoteRef: input.remoteRef && input.remoteRef.name,
-      remote: input.remote.name,
-      author: await this.getCommandUser(input),
-      input,
-    }
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      return await this.call('isogit', 'push', cmd)
+      return await this.call('isogit', 'push', input)
     } else {
-
-      const cmd2 = {
-        ...cmd,
-        ...await this.addIsomorphicGitConfig(input),
-      }
-
-      const result = await git.push({
-        ...await this.addIsomorphicGitConfigFS(),
-        ...cmd2
-      })
-
+      const result = await isoGit.push(input, await this.addIsomorphicGitConfigFS(), this)
       return result
-
     }
   }
 
   async pull(input: pullInputType) {
 
-    const cmd = {
-      ref: input.ref.name,
-      remoteRef: input.remoteRef && input.remoteRef.name,
-      author: await this.getCommandUser(input),
-      remote: input.remote.name,
-      input,
-    }
     let result
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      result = await this.call('isogit', 'pull', cmd)
+      result = await this.call('isogit', 'pull', input)
     }
     else {
-      const cmd2 = {
-        ...cmd,
-        ...await this.addIsomorphicGitConfig(input),
-      }
-      result = await git.pull({
-        ...await this.addIsomorphicGitConfigFS(),
-        ...cmd2
-      })
+      result = await isoGit.pull(input, await this.addIsomorphicGitConfigFS(), this)
     }
     setTimeout(async () => {
       await this.call('fileManager', 'refresh')
@@ -839,192 +549,19 @@ class DGitProvider extends Plugin {
   }
 
   async fetch(input: fetchInputType) {
-    const cmd = {
-      ref: input.ref && input.ref.name,
-      remoteRef: input.remoteRef && input.remoteRef.name,
-      author: await this.getCommandUser(input),
-      remote: input.remote && input.remote.name,
-      depth: input.depth || 5,
-      singleBranch: input.singleBranch,
-      relative: input.relative,
-      input
-    }
 
     let result
     if ((Registry.getInstance().get('platform').api.isDesktop())) {
-      result = await this.call('isogit', 'fetch', cmd)
-    } else {
-      const cmd2 = {
-        ...cmd,
-        ...await this.addIsomorphicGitConfig(input),
-      }
-      result = await git.fetch({
-        ...await this.addIsomorphicGitConfigFS(),
-        ...cmd2
+      result = await this.call('isogit', 'fetch', {
+        ...input,
       })
-
-    }
-
-    setTimeout(async () => {
-      await this.call('fileManager', 'refresh')
-    }, 1000)
-    return result
-  }
-
-  async export(config) {
-    if (!this.checkIpfsConfig(config)) return false
-    const workspace = await this.call('filePanel', 'getCurrentWorkspace')
-    const files = await this.getDirectory('/')
-    this.filesToSend = []
-    for (const file of files) {
-      const c = await window.remixFileSystem.readFile(`${workspace.absolutePath}/${file}`, null)
-      const ob = {
-        path: file,
-        content: c
-      }
-      this.filesToSend.push(ob)
-    }
-    const addOptions = {
-      wrapWithDirectory: true
-    }
-    const r = await this.ipfs.add(this.filesToSend, addOptions)
-    return r.cid.string
-  }
-
-  async importIPFSFiles(config, cid, workspace) {
-    const ipfs = IpfsHttpClient(config)
-    let result = false
-    try {
-      const data = ipfs.get(cid, { timeout: 60000 })
-      for await (const file of data) {
-        if (file.path) result = true
-        file.path = file.path.replace(cid, '')
-        if (!file.content) {
-          continue
-        }
-        const content = []
-        for await (const chunk of file.content) {
-          content.push(chunk)
-        }
-        const dir = path.dirname(file.path)
-        try {
-          await this.createDirectories(`${workspace.absolutePath}/${dir}`)
-        } catch (e) { throw new Error(e) }
-        try {
-          await window.remixFileSystem.writeFile(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array(), null)
-        } catch (e) { throw new Error(e) }
-      }
-    } catch (e) {
-      throw new Error(e)
-    }
-    return result
-  }
-
-  calculateLocalStorage() {
-    let _lsTotal = 0
-    let _xLen; let _x
-    for (_x in localStorage) {
-      // eslint-disable-next-line no-prototype-builtins
-      if (!localStorage.hasOwnProperty(_x)) {
-        continue
-      }
-      _xLen = ((localStorage[_x].length + _x.length) * 2)
-      _lsTotal += _xLen
-    }
-    return (_lsTotal / 1024).toFixed(2)
-  }
-
-  async import(cmd) {
-    const permission = await this.askUserPermission('import', 'Import multiple files into your workspaces.')
-    if (!permission) return false
-    if (parseFloat(this.calculateLocalStorage()) > 10000) throw new Error('The local storage of the browser is full.')
-    const cid = cmd.cid
-    await this.call('filePanel', 'createWorkspace', `workspace_${Date.now()}`, true)
-    const workspace = await this.call('filePanel', 'getCurrentWorkspace')
-    let result
-    if (cmd.local) {
-      result = await this.importIPFSFiles(this.ipfsconfig, cid, workspace)
     } else {
-      result = await this.importIPFSFiles(this.remixIPFS, cid, workspace) || await this.importIPFSFiles(this.ipfsconfig, cid, workspace) || await this.importIPFSFiles(this.globalIPFSConfig, cid, workspace)
+      result = await isoGit.fetch(input, await this.addIsomorphicGitConfigFS(), this)
     }
+
     setTimeout(async () => {
       await this.call('fileManager', 'refresh')
     }, 1000)
-    if (!result) throw new Error(`Cannot pull files from IPFS at ${cid}`)
-  }
-
-  async getItem(name) {
-    if (typeof window !== 'undefined') {
-      return window.localStorage.getItem(name)
-    }
-  }
-
-  async setItem(name, content) {
-    try {
-      if (typeof window !== 'undefined') {
-        window.localStorage.setItem(name, content)
-      }
-    } catch (e) {
-      console.log(e)
-      return false
-    }
-    return true
-  }
-
-  async zip() {
-    const zip = new JSZip()
-    const workspace = await this.call('filePanel', 'getCurrentWorkspace')
-    const files = await this.getDirectory('/')
-    this.filesToSend = []
-    for (const file of files) {
-      const c = await window.remixFileSystem.readFile(`${workspace.absolutePath}/${file}`, null)
-      zip.file(file, c)
-    }
-    await zip.generateAsync({
-      type: 'blob'
-    })
-      .then(function (content) {
-        saveAs(content, `${workspace.name}.zip`)
-      })
-  }
-
-  async createDirectories(strdirectories) {
-    const ignore = ['.', '/.', '']
-    if (ignore.indexOf(strdirectories) > -1) return false
-    const directories = strdirectories.split('/')
-    for (let i = 0; i < directories.length; i++) {
-      let previouspath = ''
-      if (i > 0) previouspath = '/' + directories.slice(0, i).join('/')
-      const finalPath = previouspath + '/' + directories[i]
-      try {
-        if (!await window.remixFileSystem.exists(finalPath)) {
-          await window.remixFileSystem.mkdir(finalPath)
-        }
-      } catch (e) {
-        console.log(e)
-      }
-    }
-  }
-
-  async getDirectory(dir) {
-    let result = []
-    const files = await this.call('fileManager', 'readdir', dir)
-    const fileArray = normalize(files)
-    for (const fi of fileArray) {
-      if (fi) {
-        const type = fi.data.isDirectory
-        if (type === true) {
-          result = [
-            ...result,
-            ...(await this.getDirectory(
-              `${fi.filename}`
-            ))
-          ]
-        } else {
-          result = [...result, fi.filename]
-        }
-      }
-    }
     return result
   }
 
@@ -1056,15 +593,22 @@ class DGitProvider extends Plugin {
         auth: input.token
       })
 
-      const user = await octokit.request('GET /user')
+      const user = await octokit.request('GET /user', {
+        headers: {
+          'X-GitHub-Api-Version': '2022-11-28'
+        }
+      })
       const emails = await octokit.request('GET /user/emails')
 
       const scopes = user.headers['x-oauth-scopes'] || ''
 
       return {
-        user: user.data,
+        user: {
+          ...user.data, isConnected:
+            user.data.login !== undefined && user.data.login !== null && user.data.login !== ''
+        },
         emails: emails.data,
-        scopes: scopes && scopes.split(',')
+        scopes: scopes && scopes.split(',').map(scope => scope.trim())
       }
     } catch (e) {
       return null
@@ -1072,6 +616,7 @@ class DGitProvider extends Plugin {
   }
 
   async remotecommits(input: remoteCommitsInputType): Promise<pagedCommits[]> {
+
     const octokit = new Octokit({
       auth: input.token
     })
@@ -1162,23 +707,4 @@ const addSlash = (file) => {
   return file
 }
 
-const normalize = (filesList) => {
-  const folders = []
-  const files = []
-  Object.keys(filesList || {}).forEach(key => {
-    if (filesList[key].isDirectory) {
-      folders.push({
-        filename: key,
-        data: filesList[key]
-      })
-    } else {
-      files.push({
-        filename: key,
-        data: filesList[key]
-      })
-    }
-  })
-  return [...folders, ...files]
-}
-
 module.exports = DGitProvider
diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index 1a8cd8be47..2b3946bca1 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -6,8 +6,6 @@ import { FileSystemProvider } from '@remix-ui/workspace' // eslint-disable-line
 import {Registry} from '@remix-project/remix-lib'
 import { RemixdHandle } from '../plugins/remixd-handle'
 import {PluginViewWrapper} from '@remix-ui/helper'
-const { HardhatHandle } = require('../files/hardhat-handle.js')
-const { FoundryHandle } = require('../files/foundry-handle.js')
 const { TruffleHandle } = require('../files/truffle-handle.js')
 
 /*
@@ -68,8 +66,6 @@ module.exports = class Filepanel extends ViewPlugin {
     this.el.setAttribute('id', 'fileExplorerView')
 
     this.remixdHandle = new RemixdHandle(this.fileProviders.localhost, appManager)
-    this.hardhatHandle = new HardhatHandle()
-    this.foundryHandle = new FoundryHandle()
     this.truffleHandle = new TruffleHandle()
     this.contentImport = contentImport
     this.workspaces = []
diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts
index 51149c3859..539a9b1c48 100644
--- a/apps/remix-ide/src/app/panels/layout.ts
+++ b/apps/remix-ide/src/app/panels/layout.ts
@@ -30,11 +30,14 @@ export type PanelConfiguration = {
 export class Layout extends Plugin {
   event: any
   panels: panels
-  maximised: { [key: string]: boolean }
+  enhanced: { [key: string]: boolean }
+  maximized: { [key: string]: boolean }
   constructor () {
     super(profile)
-    this.maximised = {
-      'dgit': true
+    this.maximized = {}
+    this.enhanced = {
+      'dgit': true,
+      'LearnEth': true
     }
     this.event = new EventEmitter()
   }
@@ -80,18 +83,30 @@ export class Layout extends Plugin {
     })
     this.on('sidePanel', 'focusChanged', async (name) => {
       const current = await this.call('sidePanel', 'currentFocus')
-      if (this.maximised[current]) {
+      if (this.enhanced[current]) {
+        this.event.emit('enhancesidepanel')
+      }
+
+      if (this.maximized[current]) {
         this.event.emit('maximisesidepanel')
-      } else {
+      }
+
+      if (!this.enhanced[current] && !this.maximized[current]) {
         this.event.emit('resetsidepanel')
       }
     })
 
     this.on('pinnedPanel', 'pinnedPlugin', async (name) => {
       const current = await this.call('pinnedPanel', 'currentFocus')
-      if (this.maximised[current]) {
+      if (this.enhanced[current]) {
+        this.event.emit('enhancepinnedpanel')
+      }
+
+      if (this.maximized[current]) {
         this.event.emit('maximisepinnedpanel')
-      } else {
+      }
+
+      if (!this.enhanced[current] && !this.maximized[current]) {
         this.event.emit('resetpinnedpanel')
       }
     })
@@ -128,13 +143,13 @@ export class Layout extends Plugin {
 
   async maximiseSidePanel () {
     const current = await this.call('sidePanel', 'currentFocus')
-    this.maximised[current] = true
+    this.maximized[current] = true
     this.event.emit('maximisesidepanel')
   }
 
   async maximisePinnedPanel () {
     const current = await this.call('pinnedPanel', 'currentFocus')
-    this.maximised[current] = true
+    this.maximized[current] = true
     this.event.emit('maximisepinnedpanel')
   }
 
@@ -146,13 +161,13 @@ export class Layout extends Plugin {
 
   async resetSidePanel () {
     const current = await this.call('sidePanel', 'currentFocus')
-    this.maximised[current] = false
+    this.enhanced[current] = false
     this.event.emit('resetsidepanel')
   }
 
   async resetPinnedPanel () {
     const current = await this.call('pinnedPanel', 'currentFocus')
-    this.maximised[current] = false
+    this.enhanced[current] = false
     this.event.emit('resetpinnedpanel')
   }
 }
diff --git a/apps/remix-ide/src/app/plugins/electron/foundryPlugin.ts b/apps/remix-ide/src/app/plugins/electron/foundryPlugin.ts
new file mode 100644
index 0000000000..1655681697
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/electron/foundryPlugin.ts
@@ -0,0 +1,13 @@
+import { ElectronPlugin } from '@remixproject/engine-electron';
+
+export class FoundryHandleDesktop extends ElectronPlugin {
+  constructor() {
+    super({
+      displayName: 'foundry',
+      name: 'foundry',
+      description: 'electron foundry',
+      methods: ['sync', 'compile']
+    })
+    this.methods = ['sync', 'compile']
+  }
+}
diff --git a/apps/remix-ide/src/app/plugins/electron/hardhatPlugin.ts b/apps/remix-ide/src/app/plugins/electron/hardhatPlugin.ts
new file mode 100644
index 0000000000..fad7190df4
--- /dev/null
+++ b/apps/remix-ide/src/app/plugins/electron/hardhatPlugin.ts
@@ -0,0 +1,13 @@
+import { ElectronPlugin } from '@remixproject/engine-electron';
+
+export class HardhatHandleDesktop extends ElectronPlugin {
+  constructor() {
+    super({
+      displayName: 'hardhat',
+      name: 'hardhat',
+      description: 'electron hardhat',
+      methods: ['sync', 'compile']
+    })
+    this.methods = ['sync', 'compile']
+  }
+}
diff --git a/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts b/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts
index 6f1d5f9152..073347a33b 100644
--- a/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts
+++ b/apps/remix-ide/src/app/plugins/parser/services/code-parser-compiler.ts
@@ -161,7 +161,7 @@ export default class CodeParserCompiler {
                 "*": ["evm.gasEstimates"]
               }
             },
-            "evmVersion": state.evmVersion && state.evmVersion.toString() || "berlin",
+            "evmVersion": state.evmVersion && state.evmVersion.toString() || "cancun",
           }
         }
 
diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx
index 6df97e60b6..943021b3ae 100644
--- a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx
+++ b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx
@@ -147,15 +147,16 @@ export class TemplatesSelectionPlugin extends ViewPlugin {
           ['ERC721', 'secondary'],
           ['ERC1155', 'primary'],
         ]}
-        title='Template explorer'
+        title='Workspace Templates'
         description="Select a template to create a workspace or to add it to current workspace"
       >
         {
-          templates(window._intl).map(template => {
+          templates(window._intl, this).map(template => {
             return <RemixUIGridSection
               plugin={this}
               key={template.name}
               title={template.name}
+              tooltipTitle={template.tooltip}
               hScrollable={false}
             >
               {template.items.map(item => {
@@ -166,14 +167,14 @@ export class TemplatesSelectionPlugin extends ViewPlugin {
                   id={item.name}
                   searchKeywords={[item.displayName, item.description, template.name]}
                   tagList={item.tagList}
-                  classList='TSCellStyle'
+                  classList={'TSCellStyle'}
                 >
                   <div className='d-flex justify-content-between h-100 flex-column'>
                     <div className='d-flex flex-column'>
                       <div>
                         {item.description && <span className='text-dark'>{item.description}</span>}
                       </div>
-                      <div className='d-flex flex-wrap'>
+                      <div className='d-flex flex-wrap mb-2'>
                         {(item.opts && item.opts.upgradeable && item.opts.upgradeable === 'uupds') && <span className='badgeForCell badge text-secondary'>Upgradeable-UUPS</span>}
                         {(item.opts && item.opts.mintable) && <span className='badgeForCell text-secondary'>mintable</span>}
                         {(item.opts && item.opts.burnable) && <span className='badgeForCell text-secondary'>burnable</span>}
@@ -211,6 +212,20 @@ export class TemplatesSelectionPlugin extends ViewPlugin {
                   </div>
                 </RemixUIGridCell>
               })}
+              { template.name === 'Cookbook' && <RemixUIGridCell
+                plugin={this}
+                title={"More from Cookbook"}
+                key={"cookbookMore"}
+                id={"cookBookMore"}
+                searchKeywords={["cookbook"]}
+                tagList={[]}
+                classList='TSCellStyle'
+              >
+                <div className='d-flex justify-content-between h-100 flex-column'>
+                  <span className='pt-4 px-1 h6 text-dark'>{ template.description }</span>
+                  <span style={{ cursor: 'pointer' }} className='mt-2 btn btn-sm border align-items-left' onClick={() => template.onClick() }>{ template.onClickLabel }</span>
+                </div>
+              </RemixUIGridCell> }
             </RemixUIGridSection>
           })}
       </RemixUIGridView>
diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts
index a42524a285..2a6ae5fc15 100644
--- a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts
+++ b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts
@@ -1,10 +1,9 @@
-
-export const templates = (intl) => {
+export const templates = (intl, plugin) => {
   return [
     {
       name: "Generic",
       items: [
-        { value: "remixDefault", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.basic' }), description: 'A default project' },
+        { value: "remixDefault", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.basic' }), description: 'The default project' },
         { value: "blank", displayName: intl.formatMessage({ id: 'filePanel.blank' }), IsArtefact: true, description: 'A blank project' }
       ]
     },
@@ -15,102 +14,102 @@ export const templates = (intl) => {
           value: "ozerc20",
           displayName: "ERC20",
           tagList: ["ERC20", "Solidity"],
-          description: 'A simple ERC20 project'
+          description: 'A simple fungible token contract'
         },
         {
-          value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          tagList: ["ERC721", "Solidity"],
-          description: 'A simple ERC721 (aka NFT) project'
+          value: "ozerc20",
+          displayName: "ERC20",
+          description: "An ERC20 contract with:",
+          tagList: ["Solidity"],
+          opts: {
+            mintable: true
+          }
         },
         {
-          value: "ozerc1155",
-          tagList: ["Solidity"],
-          displayName: "ERC1155",
-          description: 'A simple ERC1155 (multi token) project'
+          value: "ozerc20",
+          displayName: "ERC20",
+          description: "An ERC20 contract with:",
+          tagList: ["Solidity", "ERC20"],
+          opts: {
+            mintable: true,
+            burnable: true
+          },
         },
         {
           value: "ozerc20",
           displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
-          tagList: ["Solidity"],
+          description: "An ERC20 contract with:",
           opts: {
-            mintable: true
-          }
+            mintable: true,
+            pausable: true
+          },
+          tagList: ["ERC20", "Solidity"]
         },
         {
           value: "ozerc721",
           displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
-          tagList: ["Solidity", "ERC721"],
-          opts: {
-            mintable: true
-          }
+          tagList: ["ERC721", "Solidity"],
+          description: 'A simple non-fungible token (NFT) contract'
         },
         {
-          value: "ozerc1155",
-          displayName: "ERC1155",
-          tagList: ["Solidity"],
-          description: "A standard interface for contracts that manage multiple token types",
+          value: "ozerc721",
+          displayName: "ERC721 (NFT)",
+          description: "An ERC721 contract with:",
+          tagList: ["Solidity", "ERC721"],
           opts: {
             mintable: true
           }
         },
         {
-          value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
-          tagList: ["Solidity", "ERC20"],
+          value: "ozerc721",
+          displayName: "ERC721 (NFT)",
+          description: "An ERC721 contract with:",
           opts: {
             mintable: true,
             burnable: true
           },
+          tagList: ["ERC721", "Solidity"]
         },
         {
           value: "ozerc721",
           displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          description: "An ERC721 contract with:",
           opts: {
             mintable: true,
-            burnable: true
+            pausable: true
           },
           tagList: ["ERC721", "Solidity"]
         },
         {
           value: "ozerc1155",
+          tagList: ["Solidity"],
           displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
-          opts: {
-            mintable: true,
-            burnable: true
-          },
-          tagList: ["ERC1155", "Solidity"]
+          description: 'A simple multi token contract'
         },
         {
-          value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
+          value: "ozerc1155",
+          displayName: "ERC1155",
+          tagList: ["Solidity"],
+          description: "An ERC1155 contract with:",
           opts: {
-            mintable: true,
-            pausable: true
-          },
-          tagList: ["ERC20", "Solidity"]
+            mintable: true
+          }
         },
         {
-          value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          value: "ozerc1155",
+          displayName: "ERC1155",
+          description: "An ERC1155 contract with:",
           opts: {
             mintable: true,
-            pausable: true
+            burnable: true
           },
-          tagList: ["ERC721", "Solidity"]
+          tagList: ["ERC1155", "Solidity"]
         },
         {
           value: "ozerc1155",
           displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
-          tagList: ["ERC20"],
+          description: "An ERC1155 contract with:",
+          tagList: ["ERC1155"],
           opts: {
             mintable: true,
             pausable: true
@@ -123,120 +122,120 @@ export const templates = (intl) => {
       items: [
         {
           value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
+          displayName: "UUPS ERC20",
+          description: "A simple ERC20 contract using the Universal Upgradeable Proxy Standard (UUPS) pattern",
           opts: {
             upgradeable: 'uups'
           },
           tagList: ["ERC20", "Solidity"]
         },
         {
-          value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          value: "ozerc20",
+          displayName: "UUPS ERC20",
+          description: "UUPS ERC20 contract with:",
           opts: {
-            upgradeable: 'uups'
+            upgradeable: 'uups',
+            mintable: true
           },
-          tagList: ["ERC721", "Solidity"]
+          tagList: ["ERC20", "Solidity"]
         },
         {
-          value: "ozerc1155",
-          displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
+          value: "ozerc20",
+          displayName: "UUPS ERC20",
+          description: "UUPS ERC20 contract with:",
           opts: {
-            upgradeable: 'uups'
+            upgradeable: 'uups',
+            mintable: true,
+            burnable: true
           },
-          tagList: ["ERC1155", "Solidity"]
+          tagList: ["ERC20", "Solidity"]
         },
         {
           value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
+          displayName: "UUPS ERC20",
+          description: "UUPS ERC20 contract with:",
           opts: {
             upgradeable: 'uups',
-            mintable: true
+            mintable: true,
+            pausable: true
           },
           tagList: ["ERC20", "Solidity"]
         },
         {
           value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          displayName: "UUPS ERC721 (NFT)",
+          description: "A simple UUPS ERC721 contract",
           opts: {
-            upgradeable: 'uups',
-            mintable: true
+            upgradeable: 'uups'
           },
           tagList: ["ERC721", "Solidity"]
         },
         {
-          value: "ozerc1155",
-          displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
+          value: "ozerc721",
+          displayName: "UUPS ERC721 (NFT)",
+          description: "UUPS ERC721 contract with:",
           opts: {
             upgradeable: 'uups',
             mintable: true
           },
-          tagList: ["ERC1155", "Solidity"]
+          tagList: ["ERC721", "Solidity"]
         },
         {
-          value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
+          value: "ozerc721",
+          displayName: "UUPS ERC721 (NFT)",
+          description: "UUPS ERC721 contract with:",
           opts: {
             upgradeable: 'uups',
             mintable: true,
             burnable: true
           },
-          tagList: ["ERC20", "Solidity"]
+          tagList: ["ERC721", "Solidity"]
         },
         {
           value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          displayName: "UUPS ERC721 (NFT)",
+          description: "UUPS ERC721 contract with:",
           opts: {
             upgradeable: 'uups',
             mintable: true,
-            burnable: true
+            pausable: true
           },
           tagList: ["ERC721", "Solidity"]
         },
         {
           value: "ozerc1155",
-          displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
+          displayName: "UUPS ERC1155",
+          description: "A simple multi token contract using the UUPS pattern",
           opts: {
-            upgradeable: 'uups',
-            mintable: true,
-            burnable: true
+            upgradeable: 'uups'
           },
           tagList: ["ERC1155", "Solidity"]
         },
         {
-          value: "ozerc20",
-          displayName: "ERC20",
-          description: "A standard interface for fungible tokens",
+          value: "ozerc1155",
+          displayName: "UUPS ERC1155",
+          description: "UUPS ERC1155 with:",
           opts: {
             upgradeable: 'uups',
-            mintable: true,
-            pausable: true
+            mintable: true
           },
-          tagList: ["ERC20", "Solidity"]
+          tagList: ["ERC1155", "Solidity"]
         },
         {
-          value: "ozerc721",
-          displayName: "ERC721 (NFT)",
-          description: "Non-fungible Token Standard",
+          value: "ozerc1155",
+          displayName: "UUPS ERC1155",
+          description: "UUPS ERC1155 with:",
           opts: {
             upgradeable: 'uups',
             mintable: true,
-            pausable: true
+            burnable: true
           },
-          tagList: ["ERC721", "Solidity"]
+          tagList: ["ERC1155", "Solidity"]
         },
         {
           value: "ozerc1155",
-          displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
+          displayName: "UUPS ERC1155",
+          description: "UUPS ERC1155 with:",
           opts: {
             upgradeable: 'uups',
             mintable: true,
@@ -246,8 +245,8 @@ export const templates = (intl) => {
         },
         {
           value: "ozerc1155",
-          displayName: "ERC1155",
-          description: "A standard interface for contracts that manage multiple token types",
+          displayName: "UUPS ERC1155",
+          description: "UUPS ERC1155 with:",
           opts: {
             upgradeable: 'uups',
             mintable: true,
@@ -259,23 +258,82 @@ export const templates = (intl) => {
       ]
     },
     {
-      name: "OxProject",
+      name: "Cookbook",
+      tooltip: "Cookbook is a Smart Contract Search Tool. Click here to open Cookbook and browse Contracts.",
+      onClick: async () => {
+        await plugin.call('manager', 'activatePlugin', 'cookbookdev')
+        plugin.call('menuicons', 'showContent', 'cookbookdev')
+      },
+      onClickLabel: 'Open Cookbook Plugin',
+      description: 'Discover more templates!',
+      items: [
+        {
+          value: "token-sale",
+          displayName: 'Token Sale',
+          description: "ERC20 token sale contact. Sell tokens for ETH"
+        },
+        {
+          value: "simple-nft-sale",
+          displayName: 'Simple Nft Sale',
+          description: "ERC721 NFT with an adjustable price & to mint free NFTs"
+        },
+        {
+          value: "Azuki-ERC721A-NFT-Sale-basic",
+          displayName: 'Azuki ERC721A NFT Sale basic',
+          description: "An implementation of the ERC721A standard"
+        },
+        {
+          value: "Azuki-ERC721A-NFT-Sale",
+          displayName: 'Azuki ERC721A NFT Sale',
+          description: "An extension of the ERC721A standard with wallet limit"
+        },
+        {
+          value: "token-staking-with-infinite-rewards",
+          displayName: 'Token Staking with infinite rewards',
+          description: "Token staking contract to reward ERC20 tokens for every token staked"
+        },
+        {
+          value: "nft-staking-with-infinite-rewards",
+          displayName: 'NFT Staking with infinite rewards',
+          description: "NFT staking contract to reward exact number of ERC20 tokens per day"
+        },
+        {
+          value: "basic-dao",
+          displayName: 'Basic DAO',
+          description: "A very simple implementation of a DAO"
+        },
+        {
+          value: "soulbound-nft",
+          displayName: 'Soulbound NFT',
+          description: "ERC721 Soulbound NFT with no transfer capability"
+        },
+        { value: "multi-collection-nft-with-burnable-nfts-and-pausable-transfers",
+          displayName: 'Multi collection NFT',
+          description: "Multi collection NFT with:",
+          opts: {
+            burnable: true,
+            pausable: true
+          }, },
+      ]
+    },
+    {
+      name: "0xProject",
       items: [
-        { value: "zeroxErc20", displayName: "ERC20", tagList: ["ERC20", "Solidity"], description: "A standard interface for fungible tokens by 0xProject" }
+        { value: "zeroxErc20", displayName: "ERC20", tagList: ["ERC20", "Solidity"], description: "A fungible token contract by 0xProject" }
       ]
     },
     {
       name: "Gnosis Safe",
       items: [
-        { value: "gnosisSafeMultisig", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.multiSigWallet' }), description: 'Deploy or Customize the Gnosis Safe.' }
+        { value: "gnosisSafeMultisig", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.multiSigWallet' }), description: 'Deploy or customize the Gnosis Safe MultiSig Wallet' }
       ]
     },
     {
       name: "Circom ZKP",
       items: [
-        { value: "semaphore", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.semaphore' }), description: 'Run a ZK Semaphore circom circuit.' },
-        { value: "hashchecker", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.hashchecker' }), description: 'Run a ZK Hash checker circom circuit.' },
-        { value: "rln", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.rln' }), description: 'Run a Rate Limiting Nullifier circom circuit.' }
+        { value: "semaphore", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.semaphore' }), description: 'Semaphore protocol for casting a message as a provable group member' },
+        { value: "hashchecker", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.hashchecker' }), description: 'Hash checker Circom circuit' },
+        { value: "rln", tagList: ["ZKP"], displayName: intl.formatMessage({ id: 'filePanel.rln' }), description: 'Rate Limiting Nullifier Circom circuit' }
       ]
     },
     {
@@ -285,7 +343,7 @@ export const templates = (intl) => {
           value: "sindriScripts",
           tagList: ["ZKP"],
           displayName: intl.formatMessage({ id: 'filePanel.addscriptsindri' }),
-          description: 'Use the Sindri API to compile and generate proof.'
+          description: 'Use the Sindri API to compile and generate proofs'
         },
       ],
     },
@@ -294,12 +352,12 @@ export const templates = (intl) => {
       items: [
         { value: "uniswapV4Template",
           displayName: intl.formatMessage({ id: 'filePanel.uniswapV4Template' }),
-          description: 'Use an Uniswap hook'
+          description: 'Use a Uniswap hook'
         },
         {
           value: "breakthroughLabsUniswapv4Hooks",
           displayName: intl.formatMessage({ id: 'filePanel.breakthroughLabsUniswapv4Hooks' }),
-          description: 'Use an Uniswap hook developed by Breakthrough Labs'
+          description: 'Use a Uniswap hook developed by Breakthrough Labs'
         },
         {
           value: "uniswapV4HookBookMultiSigSwapHook",
@@ -315,12 +373,12 @@ export const templates = (intl) => {
           value: "contractCreate2Factory",
           tagList: ["Solidity"],
           displayName: intl.formatMessage({ id: 'filePanel.addcreate2solidityfactory' }),
-          description: 'Factory for deploying a Contract using the CREATE2 opcode.'
+          description: 'Factory for deploying a contract using the CREATE2 opcode'
         },
         {
           value: "contractDeployerScripts",
           displayName: intl.formatMessage({ id: 'filePanel.addscriptdeployer' }),
-          description: 'Script for deploying a Contract using the CREATE2 opcode.'
+          description: 'Script for deploying a contract using the CREATE2 opcode'
         }
       ]
     },
@@ -330,28 +388,28 @@ export const templates = (intl) => {
         {
           value: "etherscanScripts",
           displayName: intl.formatMessage({ id: 'filePanel.addscriptetherscan' }),
-          description: 'Script for verifying a Contract in Etherscan.'
+          description: 'Script for verifying a Contract in Etherscan'
         },
       ],
     },
     {
-      name: 'Github Actions',
+      name: 'GitHub Actions',
       items: [
         { value: "runJsTestAction",
           displayName: intl.formatMessage({ id: 'filePanel.tssoltestghaction' }),
-          description: 'A Mocha Chai Test Workflow in a GitHub CI.'
+          description: 'A Mocha Chai test workflow in a GitHub CI'
         },
         { value: "runSolidityUnittestingAction",
           displayName: intl.formatMessage({ id: 'filePanel.solghaction' }),
-          description: 'Run a Solidity Unittest Workflow in a GitHub CI.'
+          description: 'Run a Solidity unit test workflow in a GitHub CI'
         },
         {
           value: "runSlitherAction",
           displayName: intl.formatMessage({ id: 'filePanel.slitherghaction' }),
-          description: 'Run a Slither Security Analysis in a GitHub CI.'
+          description: 'Run a Slither security analysis in a GitHub CI'
         }
       ],
       IsArtefact: true
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/apps/remix-ide/src/app/providers/environment-explorer.tsx b/apps/remix-ide/src/app/providers/environment-explorer.tsx
index 8e5fe87011..8f25793db9 100644
--- a/apps/remix-ide/src/app/providers/environment-explorer.tsx
+++ b/apps/remix-ide/src/app/providers/environment-explorer.tsx
@@ -25,7 +25,7 @@ const profile = {
   methods: []
 }
 
-type ProvidersSection = `Injected` | 'Remix VMs' | 'Externals'
+type ProvidersSection = `Injected` | 'Remix VMs' | 'Externals' | 'Remix forked VMs'
 
 export class EnvironmentExplorer extends ViewPlugin {
   providers: { [key in ProvidersSection]: Provider[] }
@@ -39,6 +39,7 @@ export class EnvironmentExplorer extends ViewPlugin {
     this.providers = {
       'Injected': [],
       'Remix VMs': [],
+      'Remix forked VMs': [],
       'Externals': []
     }
   }
@@ -52,6 +53,8 @@ export class EnvironmentExplorer extends ViewPlugin {
   addProvider (provider: Provider) {
     if (provider.isInjected) {
       this.providers['Injected'].push(provider)
+    } else if (provider.isForkedVM) {
+      this.providers['Remix forked VMs'].push(provider)
     } else if (provider.isVM) {
       this.providers['Remix VMs'].push(provider)
     } else {
@@ -81,7 +84,8 @@ export class EnvironmentExplorer extends ViewPlugin {
     this.providers = {
       'Injected': [],
       'Remix VMs': [],
-      'Externals': []
+      'Externals': [],
+      'Remix forked VMs': []
     }
     for (const [key, provider] of Object.entries(this.providersFlat)) {
       this.addProvider(provider)
@@ -167,6 +171,40 @@ export class EnvironmentExplorer extends ViewPlugin {
               <div>{provider.description}</div>
             </RemixUIGridCell>
           })}</RemixUIGridSection>
+        <RemixUIGridSection
+          plugin={this}
+          title='Deploy to an In-browser forked Virtual Machine.'
+          hScrollable={false}
+        >{this.providers['Remix forked VMs'].map(provider => {
+            return <RemixUIGridCell
+              plugin={this}
+              title={provider.displayName}
+              logos={provider.logos}
+              classList='EECellStyle'
+              searchKeywords={['Remix VMs', provider.name, provider.displayName, provider.title, provider.description]}
+              pinned={this.pinnedProviders.includes(provider.name)}
+              key={provider.name}
+              id={provider.name}
+              pinStateCallback={async (pinned: boolean) => {
+                if (pinned) {
+                  this.emit('providerPinned', provider.name, provider)
+                  this.call('notification', 'toast', `"${provider.displayName}" has been added to the Environment list of the Deploy & Run Transactions plugin.`)
+                  return true
+                }
+                const providerName = await this.call('blockchain', 'getProvider')
+                if (providerName !== provider.name) {
+                  this.emit('providerUnpinned', provider.name, provider)
+                  this.call('notification', 'toast', `"${provider.displayName}" has been removed from the Environment list of the Deploy & Run Transactions plugin.`)
+                  return true
+                } else {
+                  this.call('notification', 'toast', 'Cannot unpin the current selected provider')
+                  return false
+                }
+              }}
+            >
+              <div>{provider.description}</div>
+            </RemixUIGridCell>
+          })}</RemixUIGridSection>
         <RemixUIGridSection
           plugin={this}
           title='Deploy to an external Provider.'
diff --git a/apps/remix-ide/src/app/providers/injected-custom-provider.tsx b/apps/remix-ide/src/app/providers/injected-custom-provider.tsx
index bb41eeac4a..a00604b3d9 100644
--- a/apps/remix-ide/src/app/providers/injected-custom-provider.tsx
+++ b/apps/remix-ide/src/app/providers/injected-custom-provider.tsx
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { InjectedProviderDefault } from './injected-provider-default'
 
 export class InjectedCustomProvider extends InjectedProviderDefault {
diff --git a/apps/remix-ide/src/app/providers/injected-ephemery-testnet-provider.tsx b/apps/remix-ide/src/app/providers/injected-ephemery-testnet-provider.tsx
index dd5e8266b1..4b25986ba5 100644
--- a/apps/remix-ide/src/app/providers/injected-ephemery-testnet-provider.tsx
+++ b/apps/remix-ide/src/app/providers/injected-ephemery-testnet-provider.tsx
@@ -1,6 +1,6 @@
 import * as packageJson from '../../../../../package.json'
 import { InjectedCustomProvider } from './injected-custom-provider'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 
 const profile = {
   name: 'injected-ephemery-testnet-provider',
diff --git a/apps/remix-ide/src/app/tabs/compile-tab.js b/apps/remix-ide/src/app/tabs/compile-tab.js
index e3505358af..1fb7dea231 100644
--- a/apps/remix-ide/src/app/tabs/compile-tab.js
+++ b/apps/remix-ide/src/app/tabs/compile-tab.js
@@ -9,7 +9,7 @@ import { QueryParams } from '@remix-project/remix-lib'
 import * as packageJson from '../../../../../package.json'
 import { compilerConfigChangedToastMsg, compileToastMsg } from '@remix-ui/helper'
 import { isNative } from '../../remixAppManager'
-
+import { Registry } from '@remix-project/remix-lib'
 const profile = {
   name: 'solidity',
   displayName: 'Solidity compiler',
@@ -90,6 +90,10 @@ class CompileTab extends CompilerApiMixin(ViewPlugin) { // implements ICompilerA
     return this.fileManager.mode
   }
 
+  isDesktop () {
+    return Registry.getInstance().get('platform').api.isDesktop()
+  }
+
   /**
    * set the compiler configuration
    * This function is used by remix-plugin compiler API.
diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js
index 9c99051ef8..9560713ffe 100644
--- a/apps/remix-ide/src/app/tabs/debugger-tab.js
+++ b/apps/remix-ide/src/app/tabs/debugger-tab.js
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { DebuggerUI } from '@remix-ui/debugger-ui' // eslint-disable-line
 import { DebuggerApiMixin } from '@remix-ui/debugger-ui'
 import { ViewPlugin } from '@remixproject/engine-web'
diff --git a/apps/remix-ide/src/app/tabs/locales/en/circuit.json b/apps/remix-ide/src/app/tabs/locales/en/circuit.json
index 7d9fcc8428..4cf99ba63b 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/circuit.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/circuit.json
@@ -21,5 +21,6 @@
   "circuit.exportVerifierContract": "Export verifier contract",
   "circuit.exportVerificationKey": "Export verification key",
   "circuit.exportVerifierCalldata": "Export verifier calldata",
+  "circuit.exportWtnsJson": "Export witness as JSON",
   "circuit.runSetup": "Run setup"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/en/electron.json b/apps/remix-ide/src/app/tabs/locales/en/electron.json
index cdf0a75a59..df81245b51 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/electron.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/electron.json
@@ -1,4 +1,6 @@
 {
   "electron.openFolder": "Open Folder",
-  "electron.recentFolders": "Recent Folders"
+  "electron.recentFolders": "Recent Folders",
+  "electron.gitClone": "Clone a Git Repository",
+  "electron.openFolderMessage": "In order to use Git features, you can open a folder or clone a repository."
 }
\ No newline at end of file
diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
index 6932ae3e04..6b02520e94 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json
@@ -2,6 +2,9 @@
   "filePanel.displayName": "File explorer",
   "filePanel.workspace": "WORKSPACES",
   "filePanel.create": "Create",
+
+  "filePanel.createLabel": "Create Using Template",
+  "filePanel.createBlank":"Create Blank",
   "filePanel.create.desktop": "Create Project",
   "filePanel.clone": "Clone",
   "filePanel.download": "Download",
@@ -9,7 +12,8 @@
   "filePanel.restore": "Restore",
   "filePanel.name": "Name",
   "filePanel.save": "Save",
-  "filePanel.workspace.create": "Create Workspace",
+  "filePanel.workspace.create": "Create Workspace Using Template",
+  "filePanel.workspace.createBlank": "Create Blank Workspace",
   "filePanel.workspace.create.desktop": "Create project in new folder",
   "filePanel.workspace.rename": "Rename Workspace",
   "filePanel.workspace.save_workspace": "Save Workspace",
@@ -67,7 +71,7 @@
   "filePanel.createNewFile": "Create new file",
   "filePanel.createNewFolder": "Create new folder",
   "filePanel.publishToGist": "Publish to Gist",
-  "filePanel.workspace.publishToGist": "Publish workspace to GitHub gist",
+  "filePanel.workspace.publishToGist": "Publish Workspace to GitHub Gist",
   "filePanel.uploadFile": "Open a File from your File System",
   "filePanel.uploadFolder": "Upload folder",
   "filePanel.updateGist": "Update Gist",
@@ -142,5 +146,7 @@
   "filePanel.movingFolderFailedMsg": "Unexpected error while moving folder: {src}",
   "filePanel.workspaceActions": "Workspace actions",
   "filePanel.saveCodeSample": "This code-sample workspace will not be persisted. Click here to save it.",
+  "filePanel.logInGithub": "Sign in to GitHub.",
+  "filePanel.gitHubLoggedAs": "Signed in as {githubuser}",
   "filePanel.updateSubmodules": "Update all submodules of repository. Click to pull dependencies."
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/en/git.json b/apps/remix-ide/src/app/tabs/locales/en/git.json
index c5f4fa6a09..ea64a5b02d 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/git.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/git.json
@@ -16,5 +16,6 @@
   "git.unstageall": "unstage all",
   "git.stageall": "stage all",
   "git.noremote": "this repo has no remotes",
-  "git.init": "Initialize repository"
+  "git.init": "Initialize repository",
+  "git.setup": "Setup git"
 }
\ No newline at end of file
diff --git a/apps/remix-ide/src/app/tabs/locales/en/gitui.json b/apps/remix-ide/src/app/tabs/locales/en/gitui.json
new file mode 100644
index 0000000000..eb793ed680
--- /dev/null
+++ b/apps/remix-ide/src/app/tabs/locales/en/gitui.json
@@ -0,0 +1,3 @@
+{
+    "gitui.openFolderMessage": "In order to use Git features, you can open a folder or clone a repository."
+}
\ No newline at end of file
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 588b671983..a638fd2b02 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/home.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/home.json
@@ -7,9 +7,9 @@
   "home.learnMore": "Learn more",
   "home.here": "more",
   "home.featured": "Featured",
-  "home.jumpIntoWeb3": "JUMP INTO WEB3",
-  "home.jumpIntoWeb3More": "More",
-  "home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
+  "home.learnEthPromoTitle": "LearnEth: Tutorials inside Remix",
+  "home.learnEthPromoButton": "Start Learning",
+  "home.learnEthPromoText": "Check out tutorials on Remix, Solidity, and other Web3 projects. Great for all skill levels.",
   "home.remixYouTube": "WATCH TO LEARN",
   "home.remixYouTubeText1": "Video Tips from the Remix Team",
   "home.remixYouTubeMore": "Watch",
@@ -37,6 +37,7 @@
   "home.ozerc1155TemplateDesc": "Create an ERC1155 token by importing OpenZeppelin library.",
   "home.gnosisSafeMultisigTemplateDesc": "Create Multi-Signature wallets using this template.",
   "home.zeroxErc20TemplateDesc": "Create an ERC20 token by importing 0xProject contract.",
+  "home.learnEthPluginDesc": "Learn about Remix, Solidity, and other Web3 projects.",
   "home.learn": "Learn",
   "home.learnEth1": "Remix Basics",
   "home.learnEth1Desc": "An introduction to Remix's interface and basic operations.",
diff --git a/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json b/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json
index 6541753d86..b3f77de301 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/remixUiTabs.json
@@ -4,10 +4,10 @@
   "remixUiTabs.tooltipText3": "Select .sol or .yul file to compile OR a .ts or .js file to run",
   "remixUiTabs.tooltipText4": "To explain a contract, choose a .sol file",
   "remixUiTabs.tooltipText5": "Explain the contract(s) in current file [BETA]",
-  "remixUiTabs.tooltipText6": "Enable Remix AI Copilot [BETA]",
-  "remixUiTabs.tooltipText7": "Disable Remix AI Copilot [BETA]",
+  "remixUiTabs.tooltipText6": "Enable RemixAI Copilot [BETA]",
+  "remixUiTabs.tooltipText7": "Disable RemixAI Copilot [BETA]",
   "remixUiTabs.tooltipText8": "Remix AI Tools Documentation",
-  "remixUiTabs.tooltipTextDisabledCopilot": "To use Remix AI Copilot, choose a .sol file",
+  "remixUiTabs.tooltipTextDisabledCopilot": "To use RemixAI Copilot, choose a .sol file",
   "remixUiTabs.zoomOut": "Zoom out",
   "remixUiTabs.zoomIn": "Zoom in"
 }
diff --git a/apps/remix-ide/src/app/tabs/locales/en/settings.json b/apps/remix-ide/src/app/tabs/locales/en/settings.json
index 2ea6de0d4b..41240fe28c 100644
--- a/apps/remix-ide/src/app/tabs/locales/en/settings.json
+++ b/apps/remix-ide/src/app/tabs/locales/en/settings.json
@@ -1,16 +1,18 @@
 {
   "settings.displayName": "Settings",
   "settings.reset": "Reset to Default settings",
-  "settings.general": "General settings",
-  "settings.generateContractMetadataText": "Generate contract metadata. Generate a JSON file in the contract folder. Allows to specify library addresses the contract depends on. If nothing is specified, Remix deploys libraries automatically.",
+  "settings.general": "General",
+  "settings.generateContractMetadataText": "Generate contract metadata",
+  "settings.generateContractMetadataTooltip": "Generate a JSON file in the contract folder. Allows to specify library addresses the contract depends on. If nothing is specified, Remix deploys libraries automatically.",
   "settings.ethereunVMText": "Always use the Remix VM at load",
   "settings.wordWrapText": "Word wrap in editor",
-  "settings.useAutoCompleteText": "Enable code completion in editor.",
-  "settings.useShowGasInEditorText": "Display gas estimates in editor.",
-  "settings.displayErrorsText": "Display errors in editor while typing.",
-  "settings.matomoAnalytics": "Enable Matomo Analytics. We do not collect personally identifiable information (PII). The info is used to improve the site’s UX & UI. See more about ",
-  "settings.enablePersonalModeText": " Enable Personal Mode for web3 provider. Transaction sent over Web3 will use the web3.personal API.\n",
-  "settings.warnText": "Be sure the endpoint is opened before enabling it.  This mode allows a user to provide a passphrase in the Remix interface without having to unlock the account. Although this is very convenient, you should completely trust the backend you are connected to (Geth, Parity, ...). Remix never persists any passphrase",
+  "settings.useAutoCompleteText": "Enable code completion in editor",
+  "settings.useShowGasInEditorText": "Display gas estimates in editor",
+  "settings.displayErrorsText": "Display errors in editor while typing",
+  "settings.matomoAnalytics": "Enable Matomo Analytics. See",
+  "settings.matomoAnalyticsTooltip": "We do not collect personally identifiable information (PII). The info is used to improve the site’s UX & UI.",
+  "settings.enablePersonalModeText": " Enable Personal Mode for web3 provider",
+  "settings.enablePersonalModeTooltip": "Transaction sent over Web3 will use the web3.personal API. Be sure the endpoint is opened before enabling it.  This mode allows a user to provide a passphrase in the Remix interface without having to unlock the account. Although this is very convenient, you should completely trust the backend you are connected to (Geth, Parity, ...). Remix never persists any passphrase",
   "settings.gitAccessTokenTitle": "Github Credentials",
   "settings.gitAccessTokenText": "The access token is used to publish a Gist and retrieve GitHub contents. You may need to input username/email.",
   "settings.gitAccessTokenText2":"Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only 'create gist' permission",
diff --git a/apps/remix-ide/src/app/udapp/run-tab.js b/apps/remix-ide/src/app/udapp/run-tab.js
index 35306c87d1..b0c9dfe17d 100644
--- a/apps/remix-ide/src/app/udapp/run-tab.js
+++ b/apps/remix-ide/src/app/udapp/run-tab.js
@@ -165,7 +165,7 @@ export class RunTab extends ViewPlugin {
       'foundry-provider': ['assets/img/foundry.png']
     }
 
-    const addProvider = async (position, name, displayName, isInjected, isVM, fork = '', dataId = '', title = '') => {
+    const addProvider = async (position, name, displayName, isInjected, isVM, fork = '', dataId = '', title = '', forkedVM = false) => {
       await this.call('blockchain', 'addProvider', {
         position,
         options: {},
@@ -176,6 +176,7 @@ export class RunTab extends ViewPlugin {
         logos: logos[name],
         fork,
         isInjected,
+        isForkedVM: forkedVM,
         isVM,
         title,
         init: async function () {
@@ -237,9 +238,9 @@ export class RunTab extends ViewPlugin {
     await addProvider(51, 'vm-paris', 'Remix VM (Paris)', false, true, 'paris', 'settingsVMParisMode', titleVM)
     await addProvider(52, 'vm-london', 'Remix VM (London)', false, true, 'london', 'settingsVMLondonMode', titleVM)
     await addProvider(53, 'vm-berlin', 'Remix VM (Berlin)', false, true, 'berlin', 'settingsVMBerlinMode', titleVM)
-    await addProvider(2, 'vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'cancun', 'settingsVMMainnetMode', titleVM)
-    await addProvider(3, 'vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, 'cancun', 'settingsVMSepoliaMode', titleVM)
-    await addProvider(4, 'vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM)
+    await addProvider(2, 'vm-mainnet-fork', 'Remix VM - Mainnet fork', false, true, 'cancun', 'settingsVMMainnetMode', titleVM, true)
+    await addProvider(3, 'vm-sepolia-fork', 'Remix VM - Sepolia fork', false, true, 'cancun', 'settingsVMSepoliaMode', titleVM, true)
+    await addProvider(4, 'vm-custom-fork', 'Remix VM - Custom fork', false, true, '', 'settingsVMCustomMode', titleVM, true)
 
     // wallet connect
     await addProvider(6, 'walletconnect', 'WalletConnect', false, false)
diff --git a/apps/remix-ide/src/assets/img/remi-prof.webp b/apps/remix-ide/src/assets/img/remi-prof.webp
new file mode 100644
index 0000000000..f5bfceeb4a
Binary files /dev/null and b/apps/remix-ide/src/assets/img/remi-prof.webp differ
diff --git a/apps/remix-ide/src/blockchain/blockchain.tsx b/apps/remix-ide/src/blockchain/blockchain.tsx
index 66f3baafc1..e91acc0f4e 100644
--- a/apps/remix-ide/src/blockchain/blockchain.tsx
+++ b/apps/remix-ide/src/blockchain/blockchain.tsx
@@ -39,7 +39,7 @@ export type Transaction = {
   to: string
   value: string
   data: string
-  gasLimit: number
+  gasLimit: string
   useCall: boolean
   timestamp?: number
 }
@@ -55,6 +55,7 @@ export type Provider = {
   description?: string
   isInjected: boolean
   isVM: boolean
+  isForkedVM: boolean
   title: string
   init: () => Promise<void>
   provider:{
@@ -780,6 +781,8 @@ export class Blockchain extends Plugin {
   sendTransaction(tx: Transaction) {
     return new Promise((resolve, reject) => {
       this.executionContext.detectNetwork((error, network) => {
+        tx.gasLimit = '0x0' // force using gas estimation
+
         if (error) return reject(error)
         if (network.name === 'Main' && network.id === '1') {
           return reject(new Error('It is not allowed to make this action against mainnet'))
diff --git a/apps/remix-ide/src/blockchain/execution-context.js b/apps/remix-ide/src/blockchain/execution-context.js
index fd127fb20c..cf82b96ad8 100644
--- a/apps/remix-ide/src/blockchain/execution-context.js
+++ b/apps/remix-ide/src/blockchain/execution-context.js
@@ -1,6 +1,6 @@
 /* global ethereum */
 'use strict'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { execution } from '@remix-project/remix-lib'
 import EventManager from '../lib/events'
 import { bytesToHex } from '@ethereumjs/util'
diff --git a/apps/remix-ide/src/blockchain/providers/injected.ts b/apps/remix-ide/src/blockchain/providers/injected.ts
index 8ef55f8093..9e10ebc68d 100644
--- a/apps/remix-ide/src/blockchain/providers/injected.ts
+++ b/apps/remix-ide/src/blockchain/providers/injected.ts
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { hashPersonalMessage, isHexString, bytesToHex } from '@ethereumjs/util'
 import { ExecutionContext } from '../execution-context'
 
diff --git a/apps/remix-ide/src/blockchain/providers/node.ts b/apps/remix-ide/src/blockchain/providers/node.ts
index 9c7c538307..6c316e05ff 100644
--- a/apps/remix-ide/src/blockchain/providers/node.ts
+++ b/apps/remix-ide/src/blockchain/providers/node.ts
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { hashPersonalMessage, isHexString, bytesToHex } from '@ethereumjs/util'
 import { Personal } from 'web3-eth-personal'
 import { ExecutionContext } from '../execution-context'
diff --git a/apps/remix-ide/src/blockchain/providers/vm.ts b/apps/remix-ide/src/blockchain/providers/vm.ts
index c2e6448da5..81f74137f9 100644
--- a/apps/remix-ide/src/blockchain/providers/vm.ts
+++ b/apps/remix-ide/src/blockchain/providers/vm.ts
@@ -1,4 +1,4 @@
-import Web3, { FMT_BYTES, FMT_NUMBER, LegacySendAsyncProvider } from 'web3'
+import { Web3, FMT_BYTES, FMT_NUMBER, LegacySendAsyncProvider } from 'web3'
 import { fromWei, toBigInt } from 'web3-utils'
 import { privateToAddress, hashPersonalMessage, isHexString, bytesToHex } from '@ethereumjs/util'
 import { extend, JSONRPCRequestPayload, JSONRPCResponseCallback } from '@remix-project/remix-simulator'
diff --git a/apps/remixdesktop/after-pack.js b/apps/remixdesktop/after-pack.js
new file mode 100644
index 0000000000..692890f813
--- /dev/null
+++ b/apps/remixdesktop/after-pack.js
@@ -0,0 +1,14 @@
+const fs = require('fs-extra');
+const path = require('path');
+
+exports.default = async function (context) {
+    console.log('Running after-pack hook', context);
+    const resourcesPath = context.appOutDir;
+    console.log('resourcesPath', resourcesPath);
+    console.log('context outdir', context.appOutDir);
+    // Copy the node-pty module to the app folder
+    await fs.copy(
+        path.join('./node_modules', 'node-pty'),
+        path.join(resourcesPath, 'node_modules', 'node-pty')
+    );
+};
diff --git a/apps/remixdesktop/esbuild.js b/apps/remixdesktop/esbuild.js
new file mode 100644
index 0000000000..88ce4045eb
--- /dev/null
+++ b/apps/remixdesktop/esbuild.js
@@ -0,0 +1,12 @@
+const esbuild = require('esbuild');
+
+esbuild.build({
+  entryPoints: ['src/main.ts', 'src/preload.ts'],  // Your TypeScript entry point
+  outdir: 'build',      // Output bundled file
+  bundle: true,                  // Bundle all dependencies
+  platform: 'node',              // Target Node.js platform
+  external: ['electron', 'fsevents', 'node-pty'], // Exclude native modules
+  target: ['node20'],            // Match the Node.js version for Electron
+  tsconfig: 'tsconfig.json',     // Your TypeScript config
+  minify: false,                  // Optional: Minify for production
+}).catch(() => process.exit(1));
diff --git a/apps/remixdesktop/run_git_ui_isogit_tests.sh b/apps/remixdesktop/run_git_ui_isogit_tests.sh
new file mode 100755
index 0000000000..2b88b26e24
--- /dev/null
+++ b/apps/remixdesktop/run_git_ui_isogit_tests.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+TEST_EXITCODE=0
+yarn run build:e2e && node ./splice_tests.js
+TESTFILES=$(node ./splice_tests.js | grep -i 'git' | circleci tests split --split-by=timings)
+for TESTFILE in $TESTFILES; do
+    yarn run test --use-isogit --test ./build-e2e/remixdesktop/test/tests/app/${TESTFILE} || yarn run test --use-isogit --test ./build-e2e/remixdesktop/test/tests/app/${TESTFILE} || TEST_EXITCODE=1
+done
+
+echo "$TEST_EXITCODE"
+if [ "$TEST_EXITCODE" -eq 1 ]
+then
+  exit 1
+fi
diff --git a/apps/remixdesktop/rundist_esbuild.bash b/apps/remixdesktop/rundist_esbuild.bash
new file mode 100755
index 0000000000..dfda14a074
--- /dev/null
+++ b/apps/remixdesktop/rundist_esbuild.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Read the version from package.json
+version=$(awk -F'"' '/"version":/ {print $4}' package.json)
+
+# Determine the command to run based on the version
+if [[ $version == *"beta"* ]]; then
+  command="yarn esbuild -c beta.json"
+elif [[ $version == *"alpha"* ]]; then
+  command="yarn esbuild -c alpha.json"
+elif [[ $version == *"insiders"* ]]; then
+  command="yarn esbuild -c insiders.json"
+else
+  command="yarn esbuild -c latest.json"
+fi
+
+# Append any arguments passed in CLI
+for arg in "$@"; do
+  command+=" $arg"
+done
+
+# Print and run the command
+echo "Running command: $command"
+$command
diff --git a/apps/remixdesktop/rundist_tsc.bash b/apps/remixdesktop/rundist_tsc.bash
new file mode 100755
index 0000000000..886032ec62
--- /dev/null
+++ b/apps/remixdesktop/rundist_tsc.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Read the version from package.json
+version=$(awk -F'"' '/"version":/ {print $4}' package.json)
+
+# Determine the command to run based on the version
+if [[ $version == *"beta"* ]]; then
+  command="yarn tscbuild -c beta.json"
+elif [[ $version == *"alpha"* ]]; then
+  command="yarn tscbuild -c alpha.json"
+elif [[ $version == *"insiders"* ]]; then
+  command="yarn tscbuild -c insiders.json"
+else
+  command="yarn tscbuild -c latest.json"
+fi
+
+# Append any arguments passed in CLI
+for arg in "$@"; do
+  command+=" $arg"
+done
+
+# Print and run the command
+echo "Running command: $command"
+$command
diff --git a/apps/remixdesktop/rundist_webpack.bash b/apps/remixdesktop/rundist_webpack.bash
new file mode 100755
index 0000000000..66a3a9a0dc
--- /dev/null
+++ b/apps/remixdesktop/rundist_webpack.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Read the version from package.json
+version=$(awk -F'"' '/"version":/ {print $4}' package.json)
+
+# Determine the command to run based on the version
+if [[ $version == *"beta"* ]]; then
+  command="yarn dist -c beta.json"
+elif [[ $version == *"alpha"* ]]; then
+  command="yarn dist -c alpha.json"
+elif [[ $version == *"insiders"* ]]; then
+  command="yarn dist -c insiders.json"
+else
+  command="yarn dist -c latest.json"
+fi
+
+# Append any arguments passed in CLI
+for arg in "$@"; do
+  command+=" $arg"
+done
+
+# Print and run the command
+echo "Running command: $command"
+$command
diff --git a/apps/remixdesktop/src/plugins/foundryPlugin.ts b/apps/remixdesktop/src/plugins/foundryPlugin.ts
new file mode 100644
index 0000000000..71a24c58b8
--- /dev/null
+++ b/apps/remixdesktop/src/plugins/foundryPlugin.ts
@@ -0,0 +1,248 @@
+import { Profile } from "@remixproject/plugin-utils";
+import { ElectronBasePlugin, ElectronBasePluginClient } from "@remixproject/plugin-electron"
+import chokidar from 'chokidar'
+import { ElectronBasePluginRemixdClient } from "../lib/remixd"
+import fs from 'fs'
+import * as utils from '../lib/utils'
+
+import { basename, join } from "path";
+import { spawn } from "child_process";
+const profile: Profile = {
+    name: 'foundry',
+    displayName: 'electron foundry',
+    description: 'electron foundry',
+}
+
+export class FoundryPlugin extends ElectronBasePlugin {
+    clients: any[]
+    constructor() {
+        super(profile, clientProfile, FoundryPluginClient)
+        this.methods = [...super.methods]
+    }
+}
+
+const clientProfile: Profile = {
+    name: 'foundry',
+    displayName: 'electron foundry',
+    description: 'electron foundry',
+    methods: ['sync', 'compile']
+}
+
+
+class FoundryPluginClient extends ElectronBasePluginRemixdClient {
+
+    watcher: chokidar.FSWatcher
+    warnlog: boolean
+    buildPath: string
+    cachePath: string
+    logTimeout: NodeJS.Timeout
+    processingTimeout: NodeJS.Timeout
+
+    async onActivation(): Promise<void> {
+        console.log('Foundry plugin activated')
+        this.call('terminal', 'log', { type: 'log', value: 'Foundry plugin activated' })
+        this.on('fs' as any, 'workingDirChanged', async (path: string) => {
+            console.log('workingDirChanged foundry', path)
+            this.currentSharedFolder = path
+            this.startListening()
+        })
+        this.currentSharedFolder = await this.call('fs' as any, 'getWorkingDir')
+        if(this.currentSharedFolder) this.startListening()
+    }
+
+    startListening() {
+        this.buildPath = utils.absolutePath('out', this.currentSharedFolder)
+        this.cachePath = utils.absolutePath('cache', this.currentSharedFolder)
+        console.log('Foundry plugin checking for', this.buildPath, this.cachePath)
+        if (fs.existsSync(this.buildPath) && fs.existsSync(this.cachePath)) {
+            this.listenOnFoundryCompilation()
+        } else {
+            this.listenOnFoundryFolder()
+        }
+    }
+
+    listenOnFoundryFolder() {
+        console.log('Foundry out folder doesn\'t exist... waiting for the compilation.')
+        try {
+            if (this.watcher) this.watcher.close()
+            this.watcher = chokidar.watch(this.currentSharedFolder, { depth: 1, ignorePermissionErrors: true, ignoreInitial: true })
+            // watch for new folders
+            this.watcher.on('addDir', (path: string) => {
+                console.log('add dir foundry', path)
+                if (fs.existsSync(this.buildPath) && fs.existsSync(this.cachePath)) {
+                    this.listenOnFoundryCompilation()
+                }
+            })
+        } catch (e) {
+            console.log(e)
+        }
+    }
+
+    compile() {
+        return new Promise((resolve, reject) => {
+            const cmd = `forge build`
+            const options = { cwd: this.currentSharedFolder, shell: true }
+            const child = spawn(cmd, options)
+            let result = ''
+            let error = ''
+            child.stdout.on('data', (data) => {
+                const msg = `[Foundry Compilation]: ${data.toString()}`
+                console.log('\x1b[32m%s\x1b[0m', msg)
+                result += msg + '\n'
+            })
+            child.stderr.on('data', (err) => {
+                error += `[Foundry Compilation]: ${err.toString()} \n`
+            })
+            child.on('close', () => {
+                if (error && result) resolve(error + result)
+                else if (error) reject(error)
+                else resolve(result)
+            })
+        })
+    }
+
+    checkPath() {
+        if (!fs.existsSync(this.buildPath) || !fs.existsSync(this.cachePath)) {
+            this.listenOnFoundryFolder()
+            return false
+        }
+        if (!fs.existsSync(join(this.cachePath, 'solidity-files-cache.json'))) return false
+        return true
+    }
+
+    private async processArtifact() {
+        if (!this.checkPath()) return
+        const folderFiles = await fs.promises.readdir(this.buildPath) // "out" folder
+        try {
+            const cache = JSON.parse(await fs.promises.readFile(join(this.cachePath, 'solidity-files-cache.json'), { encoding: 'utf-8' }))
+            // name of folders are file names
+            for (const file of folderFiles) {
+                const path = join(this.buildPath, file) // out/Counter.sol/
+                const compilationResult = {
+                    input: {},
+                    output: {
+                        contracts: {},
+                        sources: {}
+                    },
+                    inputSources: { sources: {}, target: '' },
+                    solcVersion: null,
+                    compilationTarget: null
+                }
+                compilationResult.inputSources.target = file
+                await this.readContract(path, compilationResult, cache)
+                this.emit('compilationFinished', compilationResult.compilationTarget, { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion)
+            }
+
+            clearTimeout(this.logTimeout)
+            this.logTimeout = setTimeout(() => {
+                // @ts-ignore
+                this.call('terminal', 'log', { type: 'log', value: `receiving compilation result from Foundry. Select a file to populate the contract interaction interface.` })
+                console.log('Syncing compilation result from Foundry')
+            }, 1000)
+
+        } catch (e) {
+            console.log(e)
+        }
+    }
+
+    async triggerProcessArtifact() {
+        // prevent multiple calls
+        clearTimeout(this.processingTimeout)
+        this.processingTimeout = setTimeout(async () => await this.processArtifact(), 1000)
+    }
+
+    listenOnFoundryCompilation() {
+        try {
+            console.log('Foundry out folder exists... processing the artifact.')
+            if (this.watcher) this.watcher.close()
+            this.watcher = chokidar.watch(this.cachePath, { depth: 0, ignorePermissionErrors: true, ignoreInitial: true })
+            this.watcher.on('change', async () => await this.triggerProcessArtifact())
+            this.watcher.on('add', async () => await this.triggerProcessArtifact())
+            this.watcher.on('unlink', async () => await this.triggerProcessArtifact())
+            // process the artifact on activation
+            this.triggerProcessArtifact()
+        } catch (e) {
+            console.log(e)
+        }
+    }
+
+    async readContract(contractFolder, compilationResultPart, cache) {
+        const files = await fs.promises.readdir(contractFolder)
+        for (const file of files) {
+            const path = join(contractFolder, file)
+            const content = await fs.promises.readFile(path, { encoding: 'utf-8' })
+            compilationResultPart.inputSources.sources[file] = { content }
+            await this.feedContractArtifactFile(file, content, compilationResultPart, cache)
+        }
+    }
+
+    async feedContractArtifactFile(path, content, compilationResultPart, cache) {
+        const contentJSON = JSON.parse(content)
+        const contractName = basename(path).replace('.json', '')
+
+        let sourcePath = ''
+        if (contentJSON?.metadata?.settings?.compilationTarget) {
+            for (const key in contentJSON.metadata.settings.compilationTarget) {
+                if (contentJSON.metadata.settings.compilationTarget[key] === contractName) {
+                    sourcePath = key
+                    break
+                }
+            }
+        }
+
+        if (!sourcePath) return
+
+        const currentCache = cache.files[sourcePath]
+        if (!currentCache.artifacts[contractName]) return
+
+        // extract source and version
+        const metadata = contentJSON.metadata
+        if (metadata.compiler && metadata.compiler.version) {
+            compilationResultPart.solcVersion = metadata.compiler.version
+        } else {
+            compilationResultPart.solcVersion = ''
+            console.log('\x1b[32m%s\x1b[0m', 'compiler version not found, please update Foundry to the latest version.')
+        }
+
+        if (metadata.sources) {
+            for (const path in metadata.sources) {
+                const absPath = utils.absolutePath(path, this.currentSharedFolder)
+                try {
+                    const content = await fs.promises.readFile(absPath, { encoding: 'utf-8' })
+                    compilationResultPart.input[path] = { content }
+                } catch (e) {
+                    compilationResultPart.input[path] = { content: '' }
+                }
+            }
+        } else {
+            console.log('\x1b[32m%s\x1b[0m', 'sources input not found, please update Foundry to the latest version.')
+        }
+
+        compilationResultPart.compilationTarget = sourcePath
+        // extract data
+        if (!compilationResultPart.output['sources'][sourcePath]) compilationResultPart.output['sources'][sourcePath] = {}
+        compilationResultPart.output['sources'][sourcePath] = {
+            ast: contentJSON['ast'],
+            id: contentJSON['id']
+        }
+        if (!compilationResultPart.output['contracts'][sourcePath]) compilationResultPart.output['contracts'][sourcePath] = {}
+
+        contentJSON.bytecode.object = contentJSON.bytecode.object.replace('0x', '')
+        contentJSON.deployedBytecode.object = contentJSON.deployedBytecode.object.replace('0x', '')
+        compilationResultPart.output['contracts'][sourcePath][contractName] = {
+            abi: contentJSON.abi,
+            evm: {
+                bytecode: contentJSON.bytecode,
+                deployedBytecode: contentJSON.deployedBytecode,
+                methodIdentifiers: contentJSON.methodIdentifiers
+            }
+        }
+    }
+
+    async sync() {
+        console.log('syncing Foundry with Remix...')
+        this.processArtifact()
+    }
+}
+
+
diff --git a/apps/remixdesktop/src/plugins/hardhatPlugin.ts b/apps/remixdesktop/src/plugins/hardhatPlugin.ts
new file mode 100644
index 0000000000..ffef08e1c7
--- /dev/null
+++ b/apps/remixdesktop/src/plugins/hardhatPlugin.ts
@@ -0,0 +1,220 @@
+import { Profile } from "@remixproject/plugin-utils";
+import { ElectronBasePlugin, ElectronBasePluginClient } from "@remixproject/plugin-electron"
+import chokidar from 'chokidar'
+import { ElectronBasePluginRemixdClient } from "../lib/remixd"
+import fs from 'fs'
+import * as utils from '../lib/utils'
+
+import { basename, join } from "path";
+import { spawn } from "child_process";
+const profile: Profile = {
+    name: 'hardhat',
+    displayName: 'electron slither',
+    description: 'electron slither',
+}
+
+export class HardhatPlugin extends ElectronBasePlugin {
+    clients: any[]
+    constructor() {
+        super(profile, clientProfile, HardhatPluginClient)
+        this.methods = [...super.methods]
+    }
+}
+
+const clientProfile: Profile = {
+    name: 'hardhat',
+    displayName: 'electron hardhat',
+    description: 'electron hardhat',
+    methods: ['sync', 'compile']
+}
+
+
+class HardhatPluginClient extends ElectronBasePluginRemixdClient {
+    watcher: chokidar.FSWatcher
+    warnlog: boolean
+    buildPath: string
+    cachePath: string
+    logTimeout: NodeJS.Timeout
+    processingTimeout: NodeJS.Timeout
+
+    async onActivation(): Promise<void> {
+        console.log('Hardhat plugin activated')
+        this.call('terminal', 'log', { type: 'log', value: 'Hardhat plugin activated' })
+        
+        this.on('fs' as any, 'workingDirChanged', async (path: string) => {
+            console.log('workingDirChanged hardhat', path)
+            this.currentSharedFolder = path
+            this.startListening()
+        })
+        this.currentSharedFolder = await this.call('fs' as any, 'getWorkingDir')
+        if(this.currentSharedFolder) this.startListening()
+    }
+
+    startListening() {
+        this.buildPath = utils.absolutePath('artifacts/contracts', this.currentSharedFolder)
+        if (fs.existsSync(this.buildPath)) {
+          this.listenOnHardhatCompilation()
+        } else {
+          console.log('If you are using Hardhat, run `npx hardhat compile` or run the compilation with `Enable Hardhat Compilation` checked from the Remix IDE.')
+          this.listenOnHardHatFolder()
+        }
+      }
+    
+      compile(configPath: string) {
+        return new Promise((resolve, reject) => {
+          const cmd = `npx hardhat compile --config ${utils.normalizePath(configPath)}`
+          const options = { cwd: this.currentSharedFolder, shell: true }
+          const child = spawn(cmd, options)
+          let result = ''
+          let error = ''
+          child.stdout.on('data', (data) => {
+            const msg = `[Hardhat Compilation]: ${data.toString()}`
+            console.log('\x1b[32m%s\x1b[0m', msg)
+            result += msg + '\n'
+          })
+          child.stderr.on('data', (err) => {
+            error += `[Hardhat Compilation]: ${err.toString()} \n`
+          })
+          child.on('close', () => {
+            if (error && result) resolve(error + result)
+            else if (error) reject(error)
+            else resolve(result)
+          })
+        })
+      }
+    
+      checkPath() {
+        if (!fs.existsSync(this.buildPath)) {
+          this.listenOnHardHatFolder()
+          return false
+        }
+        return true
+      }
+    
+      private async processArtifact() {
+        console.log('processing artifact')
+        if (!this.checkPath()) return
+        // resolving the files
+        const folderFiles = await fs.promises.readdir(this.buildPath)
+        const targetsSynced = []
+        // name of folders are file names
+        for (const file of folderFiles) { // ["artifacts/contracts/Greeter.sol/"]
+          const contractFilePath = join(this.buildPath, file)
+          const stat = await fs.promises.stat(contractFilePath)
+          if (!stat.isDirectory()) continue
+          const files = await fs.promises.readdir(contractFilePath)
+          const compilationResult = {
+            input: {},
+            output: {
+              contracts: {},
+              sources: {}
+            },
+            solcVersion: null,
+            target: null
+          }
+          for (const file of files) {
+            if (file.endsWith('.dbg.json')) { // "artifacts/contracts/Greeter.sol/Greeter.dbg.json"
+              const stdFile = file.replace('.dbg.json', '.json')
+              const contentStd = await fs.promises.readFile(join(contractFilePath, stdFile), { encoding: 'utf-8' })
+              const contentDbg = await fs.promises.readFile(join(contractFilePath, file), { encoding: 'utf-8' })
+              const jsonDbg = JSON.parse(contentDbg)
+              const jsonStd = JSON.parse(contentStd)
+              compilationResult.target = jsonStd.sourceName
+    
+              targetsSynced.push(compilationResult.target)
+              const path = join(contractFilePath, jsonDbg.buildInfo)
+              const content = await fs.promises.readFile(path, { encoding: 'utf-8' })
+    
+              await this.feedContractArtifactFile(content, compilationResult)
+            }
+            if (compilationResult.target) {
+              // we are only interested in the contracts that are in the target of the compilation
+              compilationResult.output = {
+                ...compilationResult.output,
+                contracts: { [compilationResult.target]: compilationResult.output.contracts[compilationResult.target] }
+              }
+              this.emit('compilationFinished', compilationResult.target, { sources: compilationResult.input }, 'soljson', compilationResult.output, compilationResult.solcVersion)
+            }
+          }
+        }
+    
+        clearTimeout(this.logTimeout)
+        this.logTimeout = setTimeout(() => {
+          this.call('terminal', 'log', { value: 'receiving compilation result from Hardhat. Select a file to populate the contract interaction interface.', type: 'log' })
+          if (targetsSynced.length) {
+            console.log(`Processing artifacts for files: ${[...new Set(targetsSynced)].join(', ')}`)
+            // @ts-ignore
+            this.call('terminal', 'log', { type: 'log', value: `synced with Hardhat: ${[...new Set(targetsSynced)].join(', ')}` })
+          } else {
+            console.log('No artifacts to process')
+            // @ts-ignore
+            this.call('terminal', 'log', { type: 'log', value: 'No artifacts from Hardhat to process' })
+          }
+        }, 1000)
+    
+      }
+    
+      listenOnHardHatFolder() {
+        console.log('Hardhat artifacts folder doesn\'t exist... waiting for the compilation.')
+        try {
+          if (this.watcher) this.watcher.close()
+          this.watcher = chokidar.watch(this.currentSharedFolder, { depth: 2, ignorePermissionErrors: true, ignoreInitial: true })
+          // watch for new folders
+          this.watcher.on('addDir', (path: string) => {
+            console.log('add dir hardhat', path)
+            if (fs.existsSync(this.buildPath)) {
+              this.listenOnHardhatCompilation()
+            }
+          })
+        } catch (e) {
+          console.log('listenOnHardHatFolder', e)
+        }
+      }
+    
+      async triggerProcessArtifact() {
+        console.log('triggerProcessArtifact')
+        // prevent multiple calls
+        clearTimeout(this.processingTimeout)
+        this.processingTimeout = setTimeout(async () => await this.processArtifact(), 1000)
+      }
+    
+      listenOnHardhatCompilation() {
+        try {
+          console.log('listening on Hardhat compilation...', this.buildPath)
+          if (this.watcher) this.watcher.close()
+          this.watcher = chokidar.watch(this.buildPath, { depth: 1, ignorePermissionErrors: true, ignoreInitial: true })
+          this.watcher.on('change', async () => await this.triggerProcessArtifact())
+          this.watcher.on('add', async () => await this.triggerProcessArtifact())
+          this.watcher.on('unlink', async () => await this.triggerProcessArtifact())
+          // process the artifact on activation
+          this.processArtifact()
+        } catch (e) {
+          console.log('listenOnHardhatCompilation', e)
+        }
+      }
+    
+      async sync() {
+        console.log('syncing from Hardhat')
+        this.processArtifact()
+      }
+    
+      async feedContractArtifactFile(artifactContent, compilationResultPart) {
+        const contentJSON = JSON.parse(artifactContent)
+        compilationResultPart.solcVersion = contentJSON.solcVersion
+        for (const file in contentJSON.input.sources) {
+          const source = contentJSON.input.sources[file]
+          const absPath = join(this.currentSharedFolder, file)
+          if (fs.existsSync(absPath)) { // if not that is a lib
+            const contentOnDisk = await fs.promises.readFile(absPath, { encoding: 'utf-8' })
+            if (contentOnDisk === source.content) {
+              compilationResultPart.input[file] = source
+              compilationResultPart.output['sources'][file] = contentJSON.output.sources[file]
+              compilationResultPart.output['contracts'][file] = contentJSON.output.contracts[file]
+              if (contentJSON.output.errors && contentJSON.output.errors.length) {
+                compilationResultPart.output['errors'] = contentJSON.output.errors.filter(error => error.sourceLocation.file === file)
+              }
+            }
+          }
+        }
+      }
+}
\ No newline at end of file
diff --git a/apps/remixdesktop/src/types/index.ts b/apps/remixdesktop/src/types/index.ts
index 8c0087b62e..e69de29bb2 100644
--- a/apps/remixdesktop/src/types/index.ts
+++ b/apps/remixdesktop/src/types/index.ts
@@ -1,9 +0,0 @@
-export type branch = {
-  name: string
-  remote: remote
-}
-
-export type remote = {
-  name: string
-  url: string
-}
\ No newline at end of file
diff --git a/apps/remixdesktop/test/lib/git.ts b/apps/remixdesktop/test/lib/git.ts
new file mode 100644
index 0000000000..2a47d54477
--- /dev/null
+++ b/apps/remixdesktop/test/lib/git.ts
@@ -0,0 +1,195 @@
+import { spawn, ChildProcess } from "child_process"
+
+export async function getBranches(path: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const git = spawn('git', ['branch'], { cwd: path })
+        let branches = ''
+        git.stdout.on('data', function (data) {
+            console.log('stdout git branches', data.toString())
+            branches += data.toString()
+        })
+        git.stderr.on('data', function (data) {
+            console.log('stderr git branches', data.toString())
+            reject(data.toString())
+        })
+        git.on('close', function () {
+            resolve(branches)
+        })
+    })
+}
+
+export async function getGitLog(path: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        const git = spawn('git', ['log'], { cwd: path })
+        let logs = ''
+        git.stdout.on('data', function (data) {
+            logs += data.toString()
+        })
+        git.stderr.on('err', function (data) {
+            reject(data.toString())
+        })
+        git.on('close', function () {
+            resolve(logs)
+        })
+    })
+}
+
+export async function cloneOnServer(repo: string, path: string, name: string = 'bare') {
+    console.log('cloning', repo, path)
+    return new Promise((resolve, reject) => {
+        const git = spawn(`rm -rf ${name} && git`, ['clone', repo], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data cloning', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.log('stderr data cloning', data.toString());
+            if (data.toString().includes('into')) {
+                setTimeout(() => {
+                    resolve(git);
+                }, 5000)
+            }
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            }
+        });
+    });
+}
+
+export async function onLocalGitRepoAddFile(path: string, file: string) {
+    console.log('adding file', file)
+    return new Promise((resolve, reject) => {
+        const git = spawn('touch', [file], { cwd: path });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data adding file', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('stderr adding file', data.toString());
+            reject(data.toString());
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+export async function onLocalGitRepoPush(path: string, branch: string = 'master') {
+    console.log('pushing', path)
+    return new Promise((resolve, reject) => {
+        const git = spawn('git', ['push', 'origin', branch], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('stdout data pushing', data.toString());
+            if (data.toString().includes('done')) {
+                resolve(git);
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('stderr data pushing', data.toString());
+            if (data.toString().includes(branch)) {
+                resolve(git);
+            }
+        });
+
+        git.on('error', (error) => {
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+
+export async function createCommitOnLocalServer(path: string, message: string) {
+    console.log('committing', message, path)
+    return new Promise((resolve, reject) => {
+        const git = spawn('git add . && git', ['commit', '-m', message], { cwd: path, shell: true, detached: true });
+
+        git.stdout.on('data', function (data) {
+            console.log('data stdout committing', data.toString());
+            if (data.toString().includes(message)) {
+                setTimeout(() => {
+                    resolve(git);
+                }, 1000)
+            }
+        });
+
+        git.stderr.on('data', function (data) {
+            console.error('data commiting', data.toString());
+            reject(data.toString());
+        });
+
+        git.on('error', (error) => {
+            console.error('error', error);
+            reject(`Process error: ${error.message}`);
+        });
+
+        git.on('exit', (code, signal) => {
+            if (code !== 0) {
+                console.error('exit', code, signal);
+                reject(`Process exited with code: ${code} and signal: ${signal}`);
+            } else {
+                resolve(git);
+            }
+        });
+    });
+}
+
+
+export async function spawnGitServer(path: string): Promise<ChildProcess> {
+    console.log(process.cwd())
+    try {
+        const server = spawn('yarn && sh setup.sh && yarn start:server', [`${path}`], { cwd: process.cwd() + '/../remix-ide-e2e/src/githttpbackend/', shell: true, detached: true })
+        console.log('spawned', server.stdout.closed, server.stderr.closed)
+        return new Promise((resolve, reject) => {
+            server.stdout.on('data', function (data) {
+                console.log(data.toString())
+                if (
+                    data.toString().includes('is listening')
+                    || data.toString().includes('address already in use')
+                ) {
+                    console.log('resolving')
+                    resolve(server)
+                }
+            })
+            server.stderr.on('err', function (data) {
+                console.log(data.toString())
+                reject(data.toString())
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/foundry.test.ts b/apps/remixdesktop/test/tests/app/foundry.test.ts
new file mode 100644
index 0000000000..3aa370882a
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/foundry.test.ts
@@ -0,0 +1,157 @@
+import { NightwatchBrowser } from 'nightwatch'
+import { ChildProcess, spawn, execSync } from 'child_process'
+import { homedir } from 'os'
+import path from 'path'
+import os from 'os'
+
+const projectDir = path.join('remix-desktop-test-' + Date.now().toString())
+const dir = '/tmp/' + projectDir
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        done()
+    },
+    installFoundry: function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            await downloadFoundry()
+            await installFoundry()
+            await initFoundryProject()
+            done()
+        })
+    },
+    addScript: function (browser: NightwatchBrowser) {
+        // run script in console
+        browser.executeAsync(function (dir, done) {
+            (window as any).electronAPI.openFolderInSameWindow(dir + '/hello_foundry/').then(done)
+        }, [dir], () => {
+            console.log('done window opened')
+        })
+            .waitForElementVisible('*[data-id="treeViewDivDraggableItemfoundry.toml"]', 10000)
+    },
+    compile: function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            console.log('generating compilation result')
+            await buildFoundryProject()
+            done()
+        })
+            .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Foundry').before(60000)
+        
+        let contractAaddress
+        browser.clickLaunchIcon('filePanel')
+            .openFile('src')
+            .openFile('src/Counter.sol')
+            .clickLaunchIcon('udapp')
+            .selectContract('Counter')
+            .createContract('')
+            .getAddressAtPosition(0, (address) => {
+                console.log(contractAaddress)
+                contractAaddress = address
+            })
+            .clickInstance(0)
+            .clickFunction('increment - transact (not payable)')
+            .perform((done) => {
+                browser.testConstantFunction(contractAaddress, 'number - call', null, '0:\nuint256: 1').perform(() => {
+                    done()
+                })
+            })
+    }
+}
+async function downloadFoundry(): Promise<void> {
+    console.log('downloadFoundry', process.cwd())
+    try {
+        const server = spawn('curl -L https://foundry.paradigm.xyz | bash', [], { cwd: process.cwd(), shell: true, detached: true })
+        return new Promise((resolve, reject) => {
+            server.stdout.on('data', function (data) {
+                console.log(data.toString())
+                if (
+                    data.toString().includes("simply run 'foundryup' to install Foundry")
+                    || data.toString().includes("foundryup: could not detect shell, manually add")
+                ) {
+                    console.log('resolving')
+                    resolve()
+                }
+            })
+            server.stderr.on('err', function (data) {
+                console.log(data.toString())
+                reject(data.toString())
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+async function installFoundry(): Promise<void> {
+    console.log('installFoundry', process.cwd())
+    try {
+        const server = spawn('export PATH="' + homedir() + '/.foundry/bin:$PATH" && foundryup', [], { cwd: process.cwd(), shell: true, detached: true })
+        return new Promise((resolve, reject) => {
+            server.stdout.on('data', function (data) {
+                console.log(data.toString())
+                if (
+                    data.toString().includes("foundryup: done!")
+                ) {
+                    console.log('resolving')
+                    resolve()
+                }
+            })
+            server.stderr.on('err', function (data) {
+                console.log(data.toString())
+                reject(data.toString())
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+async function initFoundryProject(): Promise<void> {
+    console.log('initFoundryProject', homedir())
+    try {
+        if (process.env.CIRCLECI) {
+            spawn('git config --global user.email \"you@example.com\"', [], { cwd: homedir(), shell: true, detached: true })
+            spawn('git config --global user.name \"Your Name\"', [], { cwd: homedir(), shell: true, detached: true })
+        }
+        spawn('mkdir ' + projectDir, [], { cwd: '/tmp/', shell: true, detached: true })
+        const server = spawn('export PATH="' + homedir() + '/.foundry/bin:$PATH" && forge init hello_foundry', [], { cwd: dir, shell: true, detached: true })
+        server.stdout.pipe(process.stdout)
+        return new Promise((resolve, reject) => {
+            server.on('exit', function (exitCode) {
+                console.log("Child exited with code: " + exitCode);
+                console.log('end')
+                resolve()
+            })
+            server.stderr.on('err', function (data) {
+                console.log('err', data.toString())
+            })
+            server.stdout.on('data', function (data) {
+                console.log('data', data.toString())
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+async function buildFoundryProject(): Promise<void> {
+    console.log('buildFoundryProject', homedir())
+    try {
+        const server = spawn('export PATH="' + homedir() + '/.foundry/bin:$PATH" && forge build', [], { cwd: dir + '/hello_foundry', shell: true, detached: true })
+        server.stdout.pipe(process.stdout)
+        return new Promise((resolve, reject) => {
+            server.on('exit', function (exitCode) {
+                console.log("Child exited with code: " + exitCode);
+                console.log('end')
+                resolve()
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+
+
+module.exports = {
+    ...{}//...process.platform.startsWith('linux') ? tests : {}
+}
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/git-ui.test.ts b/apps/remixdesktop/test/tests/app/git-ui.test.ts
new file mode 100644
index 0000000000..813c31da44
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/git-ui.test.ts
@@ -0,0 +1,203 @@
+import { ChildProcess, spawn } from "child_process"
+import kill from 'tree-kill'
+import { Nightwatch, NightwatchBrowser } from "nightwatch"
+import { spawnGitServer, getGitLog, cloneOnServer, onLocalGitRepoAddFile, createCommitOnLocalServer, onLocalGitRepoPush, getBranches } from "../../lib/git"
+let gitserver: ChildProcess
+
+/* 
+/ uses the git-http-backend package to create a git server ( if needed kill the server: kill -9 $(sudo lsof -t -i:6868)  )
+/ GROUP 1: file operations PUSH PULL COMMIT SYNC FETCH CLONE ADD
+/ GROUP 2: branch operations CREATE & PUBLISH
+/ GROUP 3: file operations rename delete
+*/
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+    after: function (browser: NightwatchBrowser) {
+        browser.perform((done) => {
+            console.log('kill server', gitserver.pid)
+            kill(gitserver.pid)
+            done()
+        })
+    },
+
+    'run server #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            gitserver = await spawnGitServer('/tmp/')
+            console.log('working directory', process.cwd())
+            done()
+        })
+    },
+
+    'clone a repo #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(5000)
+            .waitForElementVisible('*[data-id="cloneButton"]')
+            .click('*[data-id="cloneButton"]')
+            .pause(1000)
+            .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+            .click('[data-id="fileSystemModalDialogModalBody-react"]')
+            .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+            .setValue('*[data-id="modalDialogCustomPromptTextClone"]', 'http://localhost:6868/bare.git')
+            .click('[data-id="fileSystem-modal-footer-ok-react"]')
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+                    .hideToolTips()
+            })
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'Update settings for git #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .modalFooterOKClick('github-credentials-error')
+
+    },
+
+    // GROUP 1
+
+    'check file added #group1 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .pause(1000)
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit')
+            .click('*[data-id="commitButton"]')
+    },
+    'look at the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-ahead"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'sync the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
+
+            .waitForElementVisible('*[data-id="syncButton"]')
+            .click('*[data-id="syncButton"]')
+            .pause(2000)
+            .waitForElementVisible('*[data-id="commitButton"]')
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the log #group1': async function (browser: NightwatchBrowser) {
+        const logs = await getGitLog('/tmp/git/bare.git')
+        console.log(logs)
+        browser.assert.ok(logs.includes('testcommit'))
+    },
+    'change a file #group1': function (browser: NightwatchBrowser) {
+        browser.
+            openFile('test.txt').
+            pause(1000).
+            setEditorValue('changes', null)
+    },
+    'stage changed file #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='modified-unstaged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='modified-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit2')
+            .click('*[data-id="commitButton"]')
+    },
+    'push the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-push"]')
+            .click('*[data-id="sourcecontrol-push"]')
+            .pause(2000)
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit2-"]',
+                locateStrategy: 'xpath'
+            }).pause(2000)
+    },
+    'check the log for testcommit2 #group1': async function (browser: NightwatchBrowser) {
+        const logs = await getGitLog('/tmp/git/bare.git')
+        console.log(logs)
+        browser.assert.ok(logs.includes('testcommit2'))
+    },
+    'clone locally and add a file and push #group1': async function (browser: NightwatchBrowser) {
+        await cloneOnServer('http://localhost:6868/bare.git', '/tmp/')
+        await onLocalGitRepoAddFile('/tmp/bare/', 'test2.txt')
+        await createCommitOnLocalServer('/tmp/bare/', 'testlocal')
+        await onLocalGitRepoPush('/tmp/bare/', 'master')
+    },
+    'run a git fetch #group1': function (browser: NightwatchBrowser) {
+        browser
+            .pause(2000)
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible('*[data-id="sourcecontrol-fetch-branch"]')
+
+            .click('*[data-id="sourcecontrol-fetch-branch"]')
+            .pause(2000)
+            .click('*[data-id="commits-panel"]')
+            .waitForElementVisible('*[data-id="commits-panel-behind"]')
+            .click('*[data-id="commits-panel-behind"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testlocal-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'run pull from the header #group1': function (browser: NightwatchBrowser) {
+        browser.
+            click('*[data-id="sourcecontrol-button-pull"]')
+            .waitForElementNotPresent('*[data-id="commits-panel-behind"]')
+    },
+    'check if the file is added #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest2.txt"]')
+    },
+}
+const useIsoGit = process.argv.includes('--use-isogit');
+if (process.platform.startsWith('win')) {
+    module.exports = {}
+}
+else 
+    module.exports = { ...tests }
+
+
diff --git a/apps/remixdesktop/test/tests/app/git-ui_2.test.ts b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
new file mode 100644
index 0000000000..6a1f3b598b
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/git-ui_2.test.ts
@@ -0,0 +1,181 @@
+import { ChildProcess, spawn } from "child_process"
+import kill from 'tree-kill'
+import { Nightwatch, NightwatchBrowser } from "nightwatch"
+import { spawnGitServer, getGitLog, cloneOnServer, onLocalGitRepoAddFile, createCommitOnLocalServer, onLocalGitRepoPush, getBranches } from "../../lib/git"
+let gitserver: ChildProcess
+
+/* 
+/ uses the git-http-backend package to create a git server ( if needed kill the server: kill -9 $(sudo lsof -t -i:6868)  )
+/ GROUP 1: file operations PUSH PULL COMMIT SYNC FETCH CLONE ADD
+/ GROUP 2: branch operations CREATE & PUBLISH
+/ GROUP 3: file operations rename delete
+*/
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+    after: function (browser: NightwatchBrowser) {
+        browser.perform((done) => {
+            console.log('kill server', gitserver.pid)
+            kill(gitserver.pid)
+            done()
+        })
+    },
+
+    'run server #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            gitserver = await spawnGitServer('/tmp/')
+            console.log('working directory', process.cwd())
+            done()
+        })
+    },
+
+    'clone a repo #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(5000)
+            .waitForElementVisible('*[data-id="cloneButton"]')
+            .click('*[data-id="cloneButton"]')
+            .pause(1000)
+            .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+            .click('[data-id="fileSystemModalDialogModalBody-react"]')
+            .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+            .setValue('*[data-id="modalDialogCustomPromptTextClone"]', 'http://localhost:6868/bare.git')
+            .click('[data-id="fileSystem-modal-footer-ok-react"]')
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+                    .hideToolTips()
+            })
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'Update settings for git #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .modalFooterOKClick('github-credentials-error')
+
+    },
+
+    // GROUP 2 
+    'create a branch #group2': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible('*[data-id="newbranchname"]')
+            .setValue('*[data-id="newbranchname"]', 'testbranch')
+            .click('*[data-id="sourcecontrol-create-branch"]')
+            .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
+            .pause(1000)
+    },
+    'check if the branch is in the filePanel #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="workspaceGitBranchesDropdown"]')
+            .click('[data-id="workspaceGitBranchesDropdown"]')
+            .waitForElementVisible('*[data-id="workspaceGit-testbranch"]')
+            .expect.element('[data-id="workspaceGit-testbranch"]').text.to.contain('✓ ')
+    },
+    'publish the branch #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .pause(1000)
+            .click('*[data-id="publishBranchButton"]')
+            .pause(2000)
+            .waitForElementNotVisible('*[data-id="publishBranchButton"]')
+    },
+    'check if the branch is published #group2': async function (browser: NightwatchBrowser) {
+        const branches = await getBranches('/tmp/git/bare.git')
+        browser.assert.ok(branches.includes('testbranch'))
+    },
+    'add file to new branch #group2': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .pause(2000)
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .pause(1000)
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit')
+            .click('*[data-id="commitButton"]')
+            .pause(1000)
+    },
+    'check if the commit is ahead in the branches list #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="branches-panel"]')
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible('*[data-id="branches-current-branch-testbranch"]')
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-current-branch-testbranch']",
+                locateStrategy: 'xpath',
+                suppressNotFoundErrors: true
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='commits-panel-ahead']",
+                locateStrategy: 'xpath',
+                suppressNotFoundErrors: true
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branchdifference-commits-testbranch-ahead']//*[@data-id='commit-summary-testcommit-ahead']",
+                locateStrategy: 'xpath',
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branchdifference-commits-testbranch-ahead']//*[@data-id='commit-change-added-test.txt']",
+                locateStrategy: 'xpath',
+            })
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='local-branch-commits-testbranch']//*[@data-id='commit-summary-testcommit-ahead']",
+                locateStrategy: 'xpath',
+            })
+            .waitForElementVisible({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='local-branch-commits-testbranch']//*[@data-id='commit-change-added-test.txt']",
+                locateStrategy: 'xpath',
+            })
+    },
+    'switch back to master #group2': function (browser: NightwatchBrowser) {
+        browser
+            .click({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-branch-master']",
+                locateStrategy: 'xpath',
+            })
+            .waitForElementVisible({
+                selector: "//*[@data-id='branches-panel-content']//*[@data-id='branches-toggle-current-branch-master']",
+                locateStrategy: 'xpath',
+            })
+    },
+    'check if test file is gone #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementNotPresent('*[data-id="treeViewLitreeViewItemtest.txt"]')
+    }
+}
+
+const useIsoGit = process.argv.includes('--useIsoGit');
+if (process.platform.startsWith('win')) {
+    module.exports = {}
+}
+else 
+    module.exports = { ...tests }
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/git-ui_3.test.ts b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
new file mode 100644
index 0000000000..6fb96951ff
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/git-ui_3.test.ts
@@ -0,0 +1,153 @@
+import { ChildProcess, spawn } from "child_process"
+import kill from 'tree-kill'
+import { Nightwatch, NightwatchBrowser } from "nightwatch"
+import { spawnGitServer, getGitLog, cloneOnServer, onLocalGitRepoAddFile, createCommitOnLocalServer, onLocalGitRepoPush, getBranches } from "../../lib/git"
+let gitserver: ChildProcess
+
+/* 
+/ uses the git-http-backend package to create a git server ( if needed kill the server: kill -9 $(sudo lsof -t -i:6868)  )
+/ GROUP 1: file operations PUSH PULL COMMIT SYNC FETCH CLONE ADD
+/ GROUP 2: branch operations CREATE & PUBLISH
+/ GROUP 3: file operations rename delete
+*/
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+    after: function (browser: NightwatchBrowser) {
+        browser.perform((done) => {
+            console.log('kill server', gitserver.pid)
+            kill(gitserver.pid)
+            done()
+        })
+    },
+
+    'run server #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            gitserver = await spawnGitServer('/tmp/')
+            console.log('working directory', process.cwd())
+            done()
+        })
+    },
+
+    'clone a repo #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(5000)
+            .waitForElementVisible('*[data-id="cloneButton"]')
+            .click('*[data-id="cloneButton"]')
+            .pause(1000)
+            .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+            .click('[data-id="fileSystemModalDialogModalBody-react"]')
+            .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+            .setValue('*[data-id="modalDialogCustomPromptTextClone"]', 'http://localhost:6868/bare.git')
+            .click('[data-id="fileSystem-modal-footer-ok-react"]')
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+                    .hideToolTips()
+            })
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'Update settings for git #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .saveScreenshot('./reports/screenshots/gitui.png')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .saveScreenshot('./reports/screenshots/gitui2.png')
+            .pause(1000)
+            .saveScreenshot('./reports/screenshots/gitui3.png')
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .pause(1000)
+            .modalFooterOKClick('github-credentials-error')
+
+    },
+
+    'check file added #group1 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .pause(1000)
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit')
+            .click('*[data-id="commitButton"]')
+    },
+
+    // group 3
+    'rename a file #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.txt"]')
+            .click('*[data-id="treeViewLitreeViewItemtest.txt"]')
+            .renamePath('test.txt', 'test_rename', 'test_rename.txt')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest_rename.txt"]')
+            .pause(1000)
+    },
+    'stage renamed file #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible({
+                selector: "//*[@data-status='deleted-unstaged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test_rename.txt']",
+                locateStrategy: 'xpath'
+            })
+            .pause(2000)
+            .click('*[data-id="sourcecontrol-add-all"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test_rename.txt']",
+                locateStrategy: 'xpath'
+            })
+    },
+    'undo the rename #group3': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="unStageStagedtest_rename.txt"]')
+            .click('*[data-id="unStageStagedtest_rename.txt"]')
+            .pause(1000)
+            .click('*[data-id="unDoStagedtest.txt"]')
+            .pause(1000)
+            .waitForElementNotPresent({
+                selector: "//*[@data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+    },
+    'check if file is returned #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemtest.txt"]')
+    },
+
+
+}
+
+const useIsoGit = process.argv.includes('--use-isogit');
+if (process.platform.startsWith('win')) {
+    module.exports = {}
+}
+else 
+    module.exports = { ...tests }
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/git-ui_4.test.ts b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
new file mode 100644
index 0000000000..521462122d
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/git-ui_4.test.ts
@@ -0,0 +1,200 @@
+import { ChildProcess, spawn } from "child_process"
+import kill from 'tree-kill'
+import { Nightwatch, NightwatchBrowser } from "nightwatch"
+import { spawnGitServer, getGitLog, cloneOnServer, onLocalGitRepoAddFile, createCommitOnLocalServer, onLocalGitRepoPush, getBranches } from "../../lib/git"
+let gitserver: ChildProcess
+
+/* 
+/ uses the git-http-backend package to create a git server ( if needed kill the server: kill -9 $(sudo lsof -t -i:6868)  )
+/ GROUP 1: file operations PUSH PULL COMMIT SYNC FETCH CLONE ADD
+/ GROUP 2: branch operations CREATE & PUBLISH
+/ GROUP 3: file operations rename delete
+*/
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+    after: function (browser: NightwatchBrowser) {
+        browser.perform((done) => {
+            console.log('kill server', gitserver.pid)
+            kill(gitserver.pid)
+            done()
+        })
+    },
+
+    'run server #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            gitserver = await spawnGitServer('/tmp/')
+            console.log('working directory', process.cwd())
+            done()
+        })
+    },
+
+    'clone a repo #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(5000)
+            .waitForElementVisible('*[data-id="cloneButton"]')
+            .click('*[data-id="cloneButton"]')
+            .pause(1000)
+            .waitForElementVisible('[data-id="fileSystemModalDialogModalBody-react"]')
+            .click('[data-id="fileSystemModalDialogModalBody-react"]')
+            .waitForElementVisible('[data-id="modalDialogCustomPromptTextClone"]')
+            .setValue('*[data-id="modalDialogCustomPromptTextClone"]', 'http://localhost:6868/bare.git')
+            .click('[data-id="fileSystem-modal-footer-ok-react"]')
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+                    .hideToolTips()
+            })
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'Update settings for git #group1 #group2 #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .pause(1000)
+            .modalFooterOKClick('github-credentials-error')
+
+    },
+
+    // GROUP 1
+
+    'check file added #group1 #group3': function (browser: NightwatchBrowser) {
+        browser
+            .addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible('*[data-id="addToGitChangestest.txt"]')
+            .pause(1000)
+            .click('*[data-id="addToGitChangestest.txt"]')
+            .waitForElementVisible({
+                selector: "//*[@data-status='added-staged' and @data-file='/test.txt']",
+                locateStrategy: 'xpath'
+            })
+            .setValue('*[data-id="commitMessage"]', 'testcommit')
+            .click('*[data-id="commitButton"]')
+    },
+    'look at the commit #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-ahead"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'add second remote #group4': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .click('*[data-id="remotes-panel"]')
+            .waitForElementVisible('*[data-id="add-manual-remoteurl"]')
+            .setValue('*[data-id="add-manual-remoteurl"]', 'http://localhost:6868/bare2.git')
+            .waitForElementVisible('*[data-id="add-manual-remotename"]')
+            .setValue('*[data-id="add-manual-remotename"]', 'origin2')
+            .waitForElementVisible('*[data-id="add-manual-remotebtn"]')
+            .click('*[data-id="add-manual-remotebtn"]')
+    },
+    'check the buttons #group4': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="default-remote-check-origin"]')
+            .waitForElementVisible('*[data-id="set-as-default-origin2"]')
+    },
+    'check the commands #group4': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+                locateStrategy: 'xpath'
+            })
+    },
+    'switch to origin2 #group4': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="remotes-panel"]')
+            .waitForElementVisible('*[data-id="set-as-default-origin2"]')
+            .click('*[data-id="set-as-default-origin2"]')
+    },
+    'check the commands for origin2 #group4': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin2')]",
+                locateStrategy: 'xpath'
+            })
+    },
+    'sync the commit #group4': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible('*[data-id="syncButton"]')
+            .click('*[data-id="syncButton"]')
+            .waitForElementVisible('*[data-id="commitButton"]')
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the log #group4': async function (browser: NightwatchBrowser) {
+        const logs = await getGitLog('/tmp/git/bare2.git')
+        console.log(logs)
+        browser.assert.ok(logs.includes('testcommit'))
+        const logs2 = await getGitLog('/tmp/git/bare.git')
+        console.log(logs2)
+        console.log(logs2.includes('testcommit3'))
+        browser.assert.ok(logs2.includes('testcommit3'))
+    },
+    'switch to origin #group4': function (browser: NightwatchBrowser) {
+        browser
+            .pause(5000)
+            .click('*[data-id="remotes-panel"]')
+            .waitForElementVisible('*[data-id="set-as-default-origin"]')
+            .pause(1000)
+            .click('*[data-id="set-as-default-origin"]')
+    },
+    'check the commands for origin #group4': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the commit ahead #group4': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .waitForElementVisible('*[data-id="sourcecontrol-panel"]')
+            .click('*[data-id="sourcecontrol-panel"]')
+            .waitForElementVisible('*[data-id="syncButton"]')
+            // do not sync
+            .click('*[data-id="commits-panel"]')
+            .waitForElementPresent({
+                selector: '//*[@data-id="commit-summary-testcommit-ahead"]',
+                locateStrategy: 'xpath'
+            })
+    },
+}
+
+const useIsoGit = process.argv.includes('--use-isogit');
+if (process.platform.startsWith('win')) {
+    module.exports = {}
+}
+else 
+    module.exports = { ...tests }
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/github.test.ts b/apps/remixdesktop/test/tests/app/github.test.ts
new file mode 100644
index 0000000000..612be7e02f
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/github.test.ts
@@ -0,0 +1,255 @@
+import { NightwatchBrowser } from "nightwatch"
+
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+
+    'open default template': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+            .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
+            .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
+            .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .pause(3000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+            })
+
+    },
+    'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
+            .waitForElementNotPresent('*[data-id="initgit-btn"]')
+    },
+    'launch github login via FE #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+            .click('*[data-id="filepanel-login-github"]')
+    },
+    'login to github #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
+            .setValue('*[data-id="githubToken"]', process.env.dgit_token)
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+    },
+    'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
+    },
+    'check the FE for the auth user #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="filepanel-connected-img-bunsenstraat"]')
+    },
+    'clone a repository #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .click('*[data-id="clone-panel"]')
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[@data-id="fetch-repositories"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="clone-panel-content"]//*[@id="repository-select"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[@id="repository-select"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="clone-panel-content"]//*[contains(text(), "awesome-remix")]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[contains(text(), "awesome-remix")]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="clone-panel-content"]//*[@id="branch-select"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[@id="branch-select"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[contains(text(), "master")]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="clone-panel-content"]//*[@data-id="clonebtn-ethereum/awesome-remix-master"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="clone-panel-content"]//*[@data-id="clonebtn-ethereum/awesome-remix-master"]',
+                locateStrategy: 'xpath'
+            })
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[2])
+                    .pause(1000)
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+            })
+    },
+    'check if there is a README.md file #group1': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
+    },
+    'check the commands panel #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'master')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'master')]",
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the remotes #group1': function (browser: NightwatchBrowser) {
+        browser
+
+            .click('*[data-id="remotes-panel"]')
+            .waitForElementVisible('*[data-id="remotes-panel-content"]')
+            .pause(2000)
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-detail-origin-default"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="branches-current-branch-master"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-sync-origin"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="branches-branch-links"]',
+                locateStrategy: 'xpath',
+                timeout: 10000
+            })
+
+    },
+    'check the commits of branch links #group1': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="branches-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="branches-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="commit-summary-linking fixed-"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'switch to branch links #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible({
+                selector: '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-id="branches-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+            .pause(1000)
+            .click({
+                selector: '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-id="branches-toggle-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-id="branches-toggle-current-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the local branches #group1': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible({
+                selector: '//*[@data-id="branches-panel-content-local-branches"]//*[@data-id="branches-toggle-current-branch-links"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the local commits #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commits-panel"]')
+            .pause(1000)
+            .waitForElementVisible({
+                selector: '//*[@data-id="commits-current-branch-links"]//*[@data-id="commit-summary-linking fixed-"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="commits-current-branch-links"]//*[@data-id="commit-summary-linking fixed-"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="commits-current-branch-links"]//*[@data-id="commit-change-modified-README.md"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the commands panel for links #group1': function (browser: NightwatchBrowser) {
+        browser
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'links')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'origin')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'links')]",
+                locateStrategy: 'xpath'
+            })
+    },
+    'disconnect github #group1': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="disconnect-github"]')
+            .pause(1000)
+            .click('*[data-id="disconnect-github"]')
+            .waitForElementNotPresent('*[data-id="connected-as-bunsenstraat"]')
+    },
+    'check the FE for the disconnected auth user #group1': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementNotPresent('*[data-id="filepanel-connected-img-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+    },
+}
+
+module.exports = tests
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/github_2.test.ts b/apps/remixdesktop/test/tests/app/github_2.test.ts
new file mode 100644
index 0000000000..3b02b3746c
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/github_2.test.ts
@@ -0,0 +1,190 @@
+import { NightwatchBrowser } from "nightwatch"
+
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+
+    'open default template': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+            .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
+            .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
+            .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .pause(3000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+            })
+
+    },
+    'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
+            .waitForElementNotPresent('*[data-id="initgit-btn"]')
+    },
+    'launch github login via FE #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+            .click('*[data-id="filepanel-login-github"]')
+    },
+    'login to github #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
+            .setValue('*[data-id="githubToken"]', process.env.dgit_token)
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+    },
+    'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
+    },
+    'check the FE for the auth user #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="filepanel-connected-img-bunsenstraat"]')
+    },
+    'add a remote #group2': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
+            .click('*[data-id="remotes-panel"]')
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="fetch-repositories"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@id="repository-select"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@id="repository-select"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[contains(text(), "awesome-remix")]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[contains(text(), "awesome-remix")]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-panel-remotename"]',
+                locateStrategy: 'xpath'
+            })
+            .setValue({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-panel-remotename"]',
+                locateStrategy: 'xpath'
+            }, 'newremote')
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-panel-addremote"]',
+                locateStrategy: 'xpath'
+            })
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-panel-addremote"]',
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-detail-newremote-default"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the commands panel for newremote #group2': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'main')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'newremote')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'main')]",
+                locateStrategy: 'xpath'
+            })
+            .pause(1000)
+            .getAttribute({
+                selector: '//*[@data-id="sourcecontrol-pull"]',
+                locateStrategy: 'xpath'
+            }, 'disabled', (result) => {
+                if (result.value) {
+                    browser.assert.fail('Button is disabled')
+                } else {
+                    browser.assert.ok(true)
+                }
+            })
+    },
+    'remove the remote #group2': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .click('*[data-id="remotes-panel"]')
+            .waitForElementVisible({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-rm-newremote"]',
+                locateStrategy: 'xpath'
+            })
+            .pause(2000)
+            .click({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-rm-newremote"]',
+                locateStrategy: 'xpath'
+            })
+            .pause(1000)
+            .waitForElementNotPresent({
+                selector: '//*[@data-id="remotes-panel-content"]//*[@data-id="remote-detail-newremote-default"]',
+                locateStrategy: 'xpath'
+            })
+    },
+    'check the commands panel for removed remote #group2': function (browser: NightwatchBrowser) {
+        browser
+            .pause(1000)
+            .click('*[data-id="commands-panel"]')
+            .waitForElementVisible({
+                selector: "//div[@id='commands-remote-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'main')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementNotPresent({
+                selector: "//div[@id='commands-remote-origin-select']//div[contains(@class, 'singleValue') and contains(text(), 'newremote')]",
+                locateStrategy: 'xpath'
+            })
+            .waitForElementVisible({
+                selector: "//div[@id='commands-local-branch-select']//div[contains(@class, 'singleValue') and contains(text(), 'main')]",
+                locateStrategy: 'xpath'
+            })
+            .getAttribute({
+                selector: '//*[@data-id="sourcecontrol-pull"]',
+                locateStrategy: 'xpath'
+            }, 'disabled', (result) => {
+                if (result.value) {
+                    browser.assert.ok(true)
+                } else {
+                    browser.assert.fail('Button is not disabled')
+                }
+            })
+    },
+}
+
+module.exports = tests
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/github_3.test.ts b/apps/remixdesktop/test/tests/app/github_3.test.ts
new file mode 100644
index 0000000000..12542bb86f
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/github_3.test.ts
@@ -0,0 +1,180 @@
+import { NightwatchBrowser } from "nightwatch"
+
+const useIsoGit = process.argv.includes('--use-isogit');
+let commitCount = 0
+let branchCount = 0
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        browser.hideToolTips()
+        done()
+    },
+
+    'open default template': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="remixIdeIconPanel"]', 10000)
+            .waitForElementVisible('button[data-id="landingPageImportFromTemplate"]')
+            .click('button[data-id="landingPageImportFromTemplate"]')
+            .waitForElementPresent('*[data-id="create-remixDefault"]')
+            .scrollAndClick('*[data-id="create-remixDefault"]')
+            .waitForElementVisible('*[data-id="modalDialogCustomPromptTextCreate"]')
+            .waitForElementPresent('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .click('[data-id="TemplatesSelectionModalDialogContainer-react"] .modal-ok')
+            .pause(3000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[1])
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItemtests"]')
+            })
+
+    },
+    'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
+            .waitForElementNotPresent('*[data-id="initgit-btn"]')
+    },
+    'launch github login via FE #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .pause(1000)
+            .waitForElementVisible('*[data-id="filepanel-login-github"]')
+            .click('*[data-id="filepanel-login-github"]')
+    },
+    'login to github #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .waitForElementVisible('*[data-id="gitubUsername"]')
+            .setValue('*[data-id="githubToken"]', process.env.dgit_token)
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+    },
+    'check if the settings are loaded #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="connected-as-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-img-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="connected-link-bunsenstraat"]')
+            .waitForElementVisible('*[data-id="remotes-panel"]')
+    },
+    'check the FE for the auth user #group1 #group2': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('filePanel')
+            .waitForElementVisible('*[data-id="filepanel-connected-img-bunsenstraat"]')
+    },
+    // pagination test
+    'clone repo #group3': function (browser: NightwatchBrowser) {
+        browser
+            .clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="clone-panel"]')
+            .click('*[data-id="clone-panel"]')
+            .waitForElementVisible('*[data-id="clone-url"]')
+            .setValue('*[data-id="clone-url"]', 'https://github.com/yann300/remix-reward')
+            .waitForElementVisible('*[data-id="clone-branch"]')
+            .setValue('*[data-id="clone-branch"]', 'master')
+            .waitForElementVisible('*[data-id="clone-btn"]')
+            .click('*[data-id="clone-btn"]')
+            .clickLaunchIcon('filePanel')
+            .pause(5000)
+            .windowHandles(function (result) {
+                console.log(result.value)
+                browser.switchWindow(result.value[2])
+                    .pause(1000)
+                    .waitForElementVisible('*[data-id="treeViewLitreeViewItem.git"]')
+            })
+    },
+    'Update settings for git #group3': function (browser: NightwatchBrowser) {
+        browser.
+            clickLaunchIcon('dgit')
+            .waitForElementVisible('*[data-id="github-panel"]')
+            .pause(1000)
+            .click('*[data-id="github-panel"]')
+            .pause(1000)
+            .setValue('*[data-id="githubToken"]', 'invalidtoken')
+            .pause(1000)
+            .setValue('*[data-id="gitubUsername"]', 'git')
+            .pause(1000)
+            .setValue('*[data-id="githubEmail"]', 'git@example.com')
+            .pause(1000)
+            .click('*[data-id="saveGitHubCredentials"]')
+            .pause(1000)
+            .modalFooterOKClick('github-credentials-error')
+    },
+    'check the commits panel for pagination #group3': function (browser: NightwatchBrowser) {
+        browser
+            .waitForElementVisible('*[data-id="commits-panel"]')
+            .click('*[data-id="commits-panel"]')
+            .elements('xpath', '//*[@data-id="commits-current-branch-master"]//*[@data-type="commit-summary"]', function (result) {
+                console.log('Number of commit-summary elements:', (result.value as any).length);
+                if (useIsoGit) {
+                    commitCount = (result.value as any).length
+                    browser.assert.ok((result.value as any).length == 1)
+                } else {
+                    commitCount = (result.value as any).length
+                    browser.assert.ok((result.value as any).length > 2)
+                }
+            })
+
+    },
+    'load more commits #group3': function (browser: NightwatchBrowser) {
+        console.log('commitCount:', commitCount)
+        browser
+            .waitForElementVisible('*[data-id="load-more-commits"]')
+            .click('*[data-id="load-more-commits"]')
+            .waitForElementVisible('*[data-id="loader-indicator"]')
+            .waitForElementNotPresent('*[data-id="loader-indicator"]')
+            .pause(2000)
+            .elements('xpath', '//*[@data-id="commits-current-branch-master"]//*[@data-type="commit-summary"]', function (result) {
+                console.log('Number of commit-summary elements:', (result.value as any).length);
+                browser.assert.ok((result.value as any).length > commitCount)
+            })
+    },
+    'load more branches from remote #group3': function (browser: NightwatchBrowser) {
+
+        browser
+            .click('*[data-id="branches-panel"]')
+            .waitForElementVisible({
+                selector: '//*[@data-id="branches-panel-content-remote-branches"]',
+                locateStrategy: 'xpath'
+            })
+            .elements('xpath', '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-type="branches-branch"]', function (result) {
+                console.log('Number of branches elements:', (result.value as any).length);
+                if (useIsoGit) {
+                    branchCount = (result.value as any).length
+                    browser.assert.ok((result.value as any).length == 1)
+                } else {
+                    branchCount = (result.value as any).length
+                    browser.assert.ok((result.value as any).length > 2)
+                }
+            })
+
+
+        if (useIsoGit) {
+
+            browser.waitForElementVisible('*[data-id="remote-sync-origin"]')
+                .click('*[data-id="remote-sync-origin"]')
+                .waitForElementVisible('*[data-id="loader-indicator"]')
+                .waitForElementNotPresent('*[data-id="loader-indicator"]')
+                .pause(2000)
+                .elements('xpath', '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-type="branches-branch"]', function (result) {
+                    console.log('Number of branches elements:', (result.value as any).length);
+                    browser.assert.ok((result.value as any).length > branchCount)
+                })
+        } else {
+            browser.waitForElementVisible('*[data-id="show-more-branches-on-remote"]')
+                .click('*[data-id="show-more-branches-on-remote"]')
+                .pause(1000)
+                .elements('xpath', '//*[@data-id="branches-panel-content-remote-branches"]//*[@data-type="branches-branch"]', function (result) {
+                    console.log('Number of branches elements:', (result.value as any).length);
+                    browser.assert.ok((result.value as any).length > branchCount)
+                })
+        }
+
+    }
+}
+
+module.exports = tests
\ No newline at end of file
diff --git a/apps/remixdesktop/test/tests/app/hardhat.test.ts b/apps/remixdesktop/test/tests/app/hardhat.test.ts
new file mode 100644
index 0000000000..f8c093102e
--- /dev/null
+++ b/apps/remixdesktop/test/tests/app/hardhat.test.ts
@@ -0,0 +1,90 @@
+import { NightwatchBrowser } from 'nightwatch'
+import { ChildProcess, spawn, execSync } from 'child_process'
+import { homedir } from 'os'
+import path from 'path'
+import os from 'os'
+
+const dir = path.join('remix-desktop-test-' + Date.now().toString())
+
+const tests = {
+    before: function (browser: NightwatchBrowser, done: VoidFunction) {
+        done()
+    },
+    setuphardhat: function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            await setupHardhatProject()
+            done()
+        })
+    },
+    addScript: function (browser: NightwatchBrowser) {
+        // run script in console
+        browser.executeAsync(function (dir, done) {
+            (window as any).electronAPI.openFolderInSameWindow('/tmp/' + dir).then(done)
+        }, [dir], () => {
+            console.log('done window opened')
+        })
+            .waitForElementVisible('*[data-id="treeViewDivDraggableItemhardhat.config.js"]', 10000)
+    },
+    compile: function (browser: NightwatchBrowser) {
+        browser.perform(async (done) => {
+            console.log('generating compilation result')
+            await compileHardhatProject()
+            done()
+        })
+            .expect.element('*[data-id="terminalJournal"]').text.to.contain('receiving compilation result from Hardhat').before(60000)
+        let addressRef
+        browser.clickLaunchIcon('filePanel')
+            .openFile('contracts')
+            .openFile('contracts/Token.sol')
+            .clickLaunchIcon('udapp')
+            .selectAccount('0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c')
+            .selectContract('Token')
+            .createContract('')
+            .clickInstance(0)
+            .clickFunction('balanceOf - call', { types: 'address account', values: '0xCA35b7d915458EF540aDe6068dFe2F44E8fa733c' })
+            .getAddressAtPosition(0, (address) => {
+                addressRef = address
+            })
+            .perform((done) => {
+                browser.verifyCallReturnValue(addressRef, ['0:uint256: 1000000'])
+                    .perform(() => done())
+            })
+    }
+}
+
+async function compileHardhatProject(): Promise<void> {
+    console.log(process.cwd())
+    try {
+        const server = spawn('npx hardhat compile', [], { cwd: '/tmp/' + dir, shell: true, detached: true })
+        return new Promise((resolve, reject) => {
+            server.on('exit', function (exitCode) {
+                console.log("Child exited with code: " + exitCode);
+                console.log('end')
+                resolve()
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+async function setupHardhatProject(): Promise<void> {
+    console.log('setup hardhat project', dir)
+    try {
+        const server = spawn(`git clone https://github.com/NomicFoundation/hardhat-boilerplate ${dir} && cd ${dir} && yarn install && yarn add "@typechain/ethers-v5@^10.1.0" && yarn add "@typechain/hardhat@^6.1.2" && yarn add "typechain@^8.1.0" && echo "END"`, [], { cwd: '/tmp/', shell: true, detached: true })
+        return new Promise((resolve, reject) => {
+            server.on('exit', function (exitCode) {
+                console.log("Child exited with code: " + exitCode);
+                console.log('end')
+                resolve()
+            })
+        })
+    } catch (e) {
+        console.log(e)
+    }
+}
+
+
+module.exports = {
+    ...tests
+}
\ No newline at end of file
diff --git a/apps/solidity-compiler/src/app/compiler.ts b/apps/solidity-compiler/src/app/compiler.ts
index d86d5322cb..d20f8db8d8 100644
--- a/apps/solidity-compiler/src/app/compiler.ts
+++ b/apps/solidity-compiler/src/app/compiler.ts
@@ -55,4 +55,8 @@ export class CompilerClientApi extends CompilerApiMixin(PluginClient) implements
   getFileManagerMode () {
     return 'browser'
   }
+
+  isDesktop() {
+    return false
+  }
 }
diff --git a/libs/ghaction-helper/package.json b/libs/ghaction-helper/package.json
index d3ee5050b8..1292b907b4 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.36",
+  "version": "0.1.37",
   "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.42",
+    "@remix-project/remix-solidity": "^0.5.43",
     "@types/chai": "^4.3.4",
     "typescript": "^4.9.3"
   },
   "dependencies": {
     "@ethereum-waffle/chai": "^3.4.4",
-    "@remix-project/remix-simulator": "^0.2.56",
+    "@remix-project/remix-simulator": "^0.2.57",
     "chai": "^4.3.7",
     "ethers": "^5.7.2",
     "web3": "^4.1.1"
   },
   "types": "./src/index.d.ts",
-  "gitHead": "57f4196f41faf8a2879a8013327f5e275e623444"
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01"
 }
\ No newline at end of file
diff --git a/libs/ghaction-helper/src/methods.ts b/libs/ghaction-helper/src/methods.ts
index 793d904db8..d7ece2b6c6 100644
--- a/libs/ghaction-helper/src/methods.ts
+++ b/libs/ghaction-helper/src/methods.ts
@@ -3,7 +3,7 @@ import { ethers } from "ethers"
 import { Provider } from '@remix-project/remix-simulator'
 import { getArtifactsByContractName } from './artifacts-helper'
 import { SignerWithAddress } from './signer'
-import Web3 from "web3"
+import { Web3 } from "web3"
 
 const providerConfig = {
   fork: global.fork || null,
diff --git a/libs/remix-analyzer/package.json b/libs/remix-analyzer/package.json
index bdb6ca7a35..3a44ff1ebf 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.65",
+  "version": "0.5.66",
   "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"
@@ -24,9 +24,9 @@
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
-    "@remix-project/remix-astwalker": "^0.0.86",
-    "@remix-project/remix-lib": "^0.5.63",
+    "@ethereumjs/vm": "8.1.1",
+    "@remix-project/remix-astwalker": "^0.0.87",
+    "@remix-project/remix-lib": "^0.5.64",
     "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": "57f4196f41faf8a2879a8013327f5e275e623444",
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01",
   "main": "./src/index.js"
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/index.ts b/libs/remix-api/src/index.ts
index 71e343fc8a..96515e169f 100644
--- a/libs/remix-api/src/index.ts
+++ b/libs/remix-api/src/index.ts
@@ -1 +1,2 @@
-export * from './lib/remix-api'
\ No newline at end of file
+export * from './lib/remix-api'
+export * from './lib/types/git'
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/plugins/filePanel-api.ts b/libs/remix-api/src/lib/plugins/filePanel-api.ts
index 02255c26ba..53b0a7170d 100644
--- a/libs/remix-api/src/lib/plugins/filePanel-api.ts
+++ b/libs/remix-api/src/lib/plugins/filePanel-api.ts
@@ -7,6 +7,6 @@ export interface IFilePanelApi {
         switchToWorkspace: (workspace: string) => Promise<void>;
     } & StatusEvents
     methods: IFilePanel['methods'] & {
-        
+        clone: () => Promise<void>;
     }
 }
diff --git a/libs/remix-api/src/lib/plugins/fileSystem-api.ts b/libs/remix-api/src/lib/plugins/fileSystem-api.ts
index cba69f007e..84210f2f7d 100644
--- a/libs/remix-api/src/lib/plugins/fileSystem-api.ts
+++ b/libs/remix-api/src/lib/plugins/fileSystem-api.ts
@@ -1,10 +1,13 @@
-import { commitChange } from "@remix-ui/git";
+import { commitChange } from "@remix-api";
 import { IFileSystem } from "@remixproject/plugin-api"
 
 // Extended interface with 'diff' method
 export interface IExtendedFileSystem extends IFileSystem {
   methods: IFileSystem['methods'] & {
+    /** Compare the differences between two files */
     diff(change: commitChange): Promise<void>
+    refresh(): Promise<void>
+    hasGitSubmodules(): Promise<boolean>
     isGitRepo(): Promise<boolean>
   };
 }
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/plugins/fs-api.ts b/libs/remix-api/src/lib/plugins/fs-api.ts
new file mode 100644
index 0000000000..2488db988d
--- /dev/null
+++ b/libs/remix-api/src/lib/plugins/fs-api.ts
@@ -0,0 +1,13 @@
+import { StatusEvents } from "@remixproject/plugin-utils";
+
+export interface IFs {
+  events: {
+    workingDirChanged(path: string): Promise<void>,
+  } & StatusEvents,
+  methods: {
+    selectFolder(path?: string, title?: string, button?: string): Promise<string> 
+    openWindow(path?: string): Promise<void>,
+    getWorkingDir(): Promise<string>,
+    openFolderInSameWindow(path: string): Promise<void>,
+  }
+}
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/plugins/git-api.ts b/libs/remix-api/src/lib/plugins/git-api.ts
new file mode 100644
index 0000000000..228b0ccc07
--- /dev/null
+++ b/libs/remix-api/src/lib/plugins/git-api.ts
@@ -0,0 +1,43 @@
+import { StatusEvents } from "@remixproject/plugin-utils"
+import { ReadBlobResult, ReadCommitResult, StatusRow } from "isomorphic-git"
+import { commitChange, repositoriesInput, repository, cloneInputType, branchesInputType, branch, remote, logInputType, remoteCommitsInputType, pagedCommits, fetchInputType, pullInputType, pushInputType, currentBranchInput, branchInputType, checkoutInputType, addInputType, rmInputType, resolveRefInput, readBlobInput, commitInputType, statusInput, compareBranchesInput, branchDifference, initInputType, updateSubmodulesInput } from "../types/git"
+
+export interface IGitApi {
+  events: {
+      "checkout": () => void
+      "clone": () => void
+      "add": () => void
+      "rm": () => void
+      "commit": () => void
+      "branch": () => void
+      "init": () => void
+  } & StatusEvents,
+  methods: {
+      getCommitChanges(oid1: string, oid2: string): Promise<commitChange[]>
+      repositories(input: repositoriesInput): Promise<repository[]>
+      clone(input: cloneInputType): Promise<any>
+      branches(input?: branchesInputType): Promise<branch[]>,
+      remotes(): Promise<remote[]>,
+      log(input: logInputType): Promise<ReadCommitResult[]>,
+      remotecommits(input: remoteCommitsInputType): Promise<pagedCommits[]>
+      fetch(input: fetchInputType): Promise<any>
+      pull(input: pullInputType): Promise<any>
+      push(input: pushInputType): Promise<any>
+      currentbranch(input?: currentBranchInput): Promise<branch>
+      branch(input: branchInputType): Promise<void>
+      checkout(input: checkoutInputType): Promise<void>
+      add(input: addInputType): Promise<void>
+      rm(input: rmInputType): Promise<void>
+      resolveref(input: resolveRefInput): Promise<string>
+      readblob(input: readBlobInput): Promise<ReadBlobResult>
+      commit(input: commitInputType): Promise<string>
+      addremote(input: remote): Promise<void>
+      delremote(input: remote): Promise<void>
+      status(input?: statusInput): Promise<Array<StatusRow>>
+      compareBranches(input: compareBranchesInput): Promise<branchDifference>
+      init(input?: initInputType): Promise<void>
+      updateSubmodules: (input: updateSubmodulesInput) => Promise<void>
+      version: () => Promise<string>
+  }
+}
+
diff --git a/libs/remix-api/src/lib/plugins/terminal-api.ts b/libs/remix-api/src/lib/plugins/terminal-api.ts
new file mode 100644
index 0000000000..e7fc77bab5
--- /dev/null
+++ b/libs/remix-api/src/lib/plugins/terminal-api.ts
@@ -0,0 +1,10 @@
+import { ITerminal } from "@remixproject/plugin-api/src/lib/terminal"
+import { StatusEvents } from "@remixproject/plugin-utils"
+
+export interface IExtendedTerminalApi extends ITerminal {
+  events: {
+  } & StatusEvents
+  methods: ITerminal['methods'] & {
+    logHtml(html: string): void
+  }
+}
\ No newline at end of file
diff --git a/libs/remix-api/src/lib/remix-api.ts b/libs/remix-api/src/lib/remix-api.ts
index 56628dc5b0..71b3536910 100644
--- a/libs/remix-api/src/lib/remix-api.ts
+++ b/libs/remix-api/src/lib/remix-api.ts
@@ -1,13 +1,14 @@
-import { IGitApi } from "@remix-ui/git"
 import { IRemixApi } from "@remixproject/plugin-api"
 import { StatusEvents } from "@remixproject/plugin-utils"
 import { IConfigApi } from "./plugins/config-api"
 import { IFileDecoratorApi } from "./plugins/filedecorator-api"
 import { IExtendedFileSystem } from "./plugins/fileSystem-api"
+import { IFs } from "./plugins/fs-api"
+import { IGitApi } from "./plugins/git-api"
 import { INotificationApi } from "./plugins/notification-api"
 import { ISettings } from "./plugins/settings-api"
+import { IExtendedTerminalApi } from "./plugins/terminal-api"
 import { IFilePanelApi } from "./plugins/filePanel-api"
-import { Plugin } from "@remixproject/engine"
 import { ISidePanelApi } from "./plugins/sidePanel-api"
 import { IPinnedPanelApi } from "./plugins/pinned-panel-api"
 import { ILayoutApi } from "./plugins/layout-api"
@@ -20,6 +21,9 @@ export interface ICustomRemixApi extends IRemixApi {
   settings: ISettings
   fileDecorator: IFileDecoratorApi
   fileManager: IExtendedFileSystem
+  isogit: IGitApi,
+  terminal: IExtendedTerminalApi
+  fs: IFs
   filePanel: IFilePanelApi
   sidePanel: ISidePanelApi
   pinnedPanel: IPinnedPanelApi
diff --git a/libs/remix-api/src/lib/types/git.ts b/libs/remix-api/src/lib/types/git.ts
new file mode 100644
index 0000000000..463e515715
--- /dev/null
+++ b/libs/remix-api/src/lib/types/git.ts
@@ -0,0 +1,206 @@
+import { Endpoints } from "@octokit/types"
+import { AuthCallback, HttpClient, ReadCommitResult } from "isomorphic-git"
+
+export type branchDifference = {
+  uniqueHeadCommits: ReadCommitResult[],
+  uniqueRemoteCommits: ReadCommitResult[],
+}
+
+
+export type commitChange = {
+  type: commitChangeType
+  path: string,
+  hashModified: string,
+  hashOriginal: string,
+  original?: string,
+  modified?: string,
+  readonly?: boolean
+}
+
+export type commitChangeTypes = {
+  "deleted": "D"
+  "modified": "M"
+  "added": "A",
+  "unknown": "?"
+}
+
+export type pagedCommits = {
+  page: number,
+  perPage: number,
+  total: number,
+  hasNextPage: boolean,
+  commits: ReadCommitResult[]
+}
+
+export enum syncStatus {
+  "sync" = "sync",
+  "publishBranch" = "publishBranch",
+  "none" = "none",
+}
+
+export type repository = {
+  name: string
+  html_url: string
+  owner: {
+      login: string
+  },
+  full_name: string
+  default_branch: string
+  id: number
+  url: string
+}
+
+export type branch = {
+  name: string
+  remote: remote
+}
+
+export type remote = {
+  name: string
+  url: string
+}
+
+export type remoteBranch = {
+  name: string
+}
+
+export type commitChangeType = keyof commitChangeTypes
+
+export type initInputType = {
+  defaultBranch: string
+}
+
+export type author = {
+  name: string,
+  email: string,
+}
+
+export type updateSubmodulesInput = {
+  dir?: string
+  token?: string
+}
+
+export type remoteCommitsInputType = {
+  owner: string, repo: string, token: string, branch: string, length: number, page: number
+}
+
+export type compareBranchesInput = {
+  branch: branch, remote: remote
+}
+
+export type fetchInputType = {
+  remote: remote,
+  ref?: branch,
+  remoteRef?: branch,
+  depth?: number,
+  singleBranch?: boolean,
+  relative?: boolean,
+  quiet?: boolean
+  author?: author
+  token?: string
+}
+
+export type logInputType = {
+  ref: string,
+  depth?: number,
+}
+
+export type pullInputType = {
+  remote: remote, 
+  ref: branch, 
+  remoteRef?: branch
+  author?: author
+  token?: string
+}
+
+export type pushInputType = {
+  remote: remote, 
+  ref: branch, 
+  remoteRef?: branch, 
+  force?: boolean,
+  author?: author,
+  token?: string
+}
+
+export type branchInputType = {
+  ref: string,
+  checkout?: boolean
+  refresh?: boolean
+  force?: boolean
+}
+
+export type currentBranchInput = {
+  fs: any,
+  dir: string
+}
+
+export type checkoutInputType = {
+  ref: string,
+  force?: boolean,
+  remote?: string
+  refresh?: boolean
+  fetch?: boolean
+}
+
+export type addInputType = {
+  filepath: string | string[]
+}
+
+export type rmInputType = {
+  filepath: string
+}
+
+export type resolveRefInput = {
+  ref: string
+}
+
+export type readBlobInput = {
+  oid: string,
+  filepath: string
+}
+
+export type commitInputType = {
+  author: {
+      name: string,
+      email: string,
+  },
+  message: string,
+}
+
+export type branchesInputType = {
+  fs?: any
+  dir?: string
+}
+
+export interface cloneInputType {
+  url: string,
+  branch?: string,
+  depth?: number,
+  singleBranch?: boolean
+  workspaceName?: string
+  workspaceExists?: boolean
+  token?: string
+  dir?: string // where the clone should happen on desktop
+}
+
+export interface repositoriesInput { token: string, page?: number, per_page?: number }
+
+export interface statusInput { ref: string, filepaths?: string[] }
+
+export type isoGitFSConfig = {
+  fs: any,
+  dir: string,
+}
+
+export type isoGitProxyConfig = {
+  corsProxy: string
+  http: HttpClient
+  onAuth: AuthCallback
+}
+
+export type GitHubUser = Partial<Endpoints["GET /user"]["response"]['data']> & {
+  isConnected: boolean
+}
+
+export type userEmails = Endpoints["GET /user/emails"]["response"]["data"]
+
diff --git a/libs/remix-astwalker/package.json b/libs/remix-astwalker/package.json
index dfc1642738..8414467d03 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.86",
+  "version": "0.0.87",
   "description": "Tool to walk through Solidity AST",
   "main": "src/index.js",
   "scripts": {
@@ -36,8 +36,8 @@
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
-    "@remix-project/remix-lib": "^0.5.63",
+    "@ethereumjs/vm": "8.1.1",
+    "@remix-project/remix-lib": "^0.5.64",
     "@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": "57f4196f41faf8a2879a8013327f5e275e623444",
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/package.json b/libs/remix-debug/package.json
index 3ac26c3cf7..4f37b7bcac 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.56",
+  "version": "0.5.57",
   "description": "Tool to debug Ethereum transactions",
   "contributors": [
     {
@@ -25,11 +25,11 @@
     "@ethereumjs/common": "4.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
-    "@remix-project/remix-astwalker": "^0.0.86",
-    "@remix-project/remix-lib": "^0.5.63",
-    "@remix-project/remix-simulator": "^0.2.56",
-    "@remix-project/remix-solidity": "^0.5.42",
+    "@ethereumjs/vm": "8.1.1",
+    "@remix-project/remix-astwalker": "^0.0.87",
+    "@remix-project/remix-lib": "^0.5.64",
+    "@remix-project/remix-simulator": "^0.2.57",
+    "@remix-project/remix-solidity": "^0.5.43",
     "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": "57f4196f41faf8a2879a8013327f5e275e623444",
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-debug/src/cmdline/index.ts b/libs/remix-debug/src/cmdline/index.ts
index 2bad4a431e..da56ba00b9 100644
--- a/libs/remix-debug/src/cmdline/index.ts
+++ b/libs/remix-debug/src/cmdline/index.ts
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { Debugger } from '../debugger/debugger'
 import { EventEmitter } from 'events'
 
diff --git a/libs/remix-debug/src/init.ts b/libs/remix-debug/src/init.ts
index 4ddafff021..8217c0808a 100644
--- a/libs/remix-debug/src/init.ts
+++ b/libs/remix-debug/src/init.ts
@@ -1,5 +1,5 @@
 'use strict'
-import Web3, { Web3PluginBase } from 'web3'
+import { Web3, Web3PluginBase } from 'web3'
 import { toNumber } from 'web3-utils'
 
 export function extendWeb3 (web3) {
diff --git a/libs/remix-git/index.ts b/libs/remix-git/index.ts
new file mode 100644
index 0000000000..7285bb292a
--- /dev/null
+++ b/libs/remix-git/index.ts
@@ -0,0 +1 @@
+export { isoGit } from './src/isogit'
\ No newline at end of file
diff --git a/libs/remix-git/src/isogit.ts b/libs/remix-git/src/isogit.ts
new file mode 100644
index 0000000000..2c608d9ce2
--- /dev/null
+++ b/libs/remix-git/src/isogit.ts
@@ -0,0 +1,345 @@
+import { GitHubUser, author, branch, cloneInputType, commitChange, compareBranchesInput, currentBranchInput, fetchInputType, isoGitFSConfig, isoGitProxyConfig, pullInputType, pushInputType, remote, userEmails } from "@remix-api"
+import git from 'isomorphic-git'
+import {
+  Plugin
+} from '@remixproject/engine'
+import http from 'isomorphic-git/http/web'
+
+import { Octokit } from "octokit"
+import { ElectronBasePluginClient } from "@remixproject/plugin-electron"
+const currentbranch = async (input: currentBranchInput, fsConfig: isoGitFSConfig) => {
+
+  try {
+    const cmd = input ? fsConfig ? { ...fsConfig, ...input } : input : fsConfig
+
+    const name = await git.currentBranch(cmd)
+    let remote: remote = undefined
+    try {
+      const remoteName = await git.getConfig({
+        ...fsConfig,
+        path: `branch.${name}.remote`
+      })
+      if (remoteName) {
+        const remoteUrl = await git.getConfig({
+          ...fsConfig,
+          path: `remote.${remoteName}.url`
+        })
+        remote = { name: remoteName, url: remoteUrl }
+      }
+
+    } catch (e) {
+      // do nothing
+    }
+
+    return {
+      remote: remote,
+      name: name || ''
+    }
+  } catch (e) {
+    return undefined
+  }
+}
+
+const branches = async (fsConfig: isoGitFSConfig) => {
+  try {
+
+    const remotes = await isoGit.remotes(fsConfig)
+    let branches: branch[] = []
+    branches = (await git.listBranches(fsConfig)).map((branch) => { return { remote: undefined, name: branch } })
+    for (const remote of remotes) {
+      const cmd = {
+        ...fsConfig,
+        remote: remote.name
+      }
+      const remotebranches = (await git.listBranches(cmd)).map((branch) => { return { remote: remote, name: branch } })
+      branches = [...branches, ...remotebranches]
+    }
+    return branches
+  } catch (e) {
+    console.log(e)
+    return []
+  }
+}
+
+const remotes = async (fsConfig: isoGitFSConfig) => {
+
+  let remotes: remote[] = []
+  try {
+    remotes = (await git.listRemotes({ ...fsConfig })).map((remote) => { return { name: remote.remote, url: remote.url } }
+    )
+  } catch (e) {
+    // do nothing
+  }
+  return remotes
+}
+
+const push = async (input: pushInputType, fsConfig: isoGitFSConfig, plugin: Plugin | ElectronBasePluginClient) => {
+  const cmd = {
+    force: input.force,
+    ref: input.ref.name,
+    remoteRef: input.remoteRef && input.remoteRef.name,
+    remote: input.remote.name,
+    author: await getAuthor(input, plugin),
+    input,
+  }
+
+  const proxy = await isoGit.addIsomorphicGitProxyConfig(input, plugin)
+  console.log({ ...fsConfig, ...cmd, ...proxy })
+  return await git.push({ ...fsConfig, ...cmd, ...proxy })
+}
+
+const pull = async (input: pullInputType, fsConfig: isoGitFSConfig, plugin: Plugin | ElectronBasePluginClient) => {
+  const cmd = {
+    ref: input.ref.name,
+    remoteRef: input.remoteRef && input.remoteRef.name,
+    author: await getAuthor(input, plugin),
+    remote: input.remote.name,
+    input,
+  }
+  const proxy = await isoGit.addIsomorphicGitProxyConfig(input, plugin)
+  console.log({ ...fsConfig, ...cmd, ...proxy })
+  return await git.pull({ ...fsConfig, ...cmd, ...proxy })
+}
+
+const fetch = async (input: fetchInputType, fsConfig: isoGitFSConfig, plugin: Plugin | ElectronBasePluginClient) => {
+  const cmd = {
+    ref: input.ref && input.ref.name,
+    remoteRef: input.remoteRef && input.remoteRef.name,
+    author: await getAuthor(input, plugin),
+    remote: input.remote && input.remote.name,
+    depth: input.depth || 5,
+    singleBranch: input.singleBranch,
+    relative: input.relative,
+    input
+  }
+  const proxy = await isoGit.addIsomorphicGitProxyConfig(input, plugin)
+  console.log({ ...fsConfig, ...cmd, ...proxy })
+  return await git.fetch({ ...fsConfig, ...cmd, ...proxy })
+}
+
+const clone = async (input: cloneInputType, fsConfig: isoGitFSConfig, plugin: Plugin | ElectronBasePluginClient) => {
+  const proxy = await isoGit.addIsomorphicGitProxyConfig(input, plugin)
+  const cmd = {
+    url: input.url,
+    singleBranch: input.singleBranch,
+    ref: input.branch,
+    depth: input.depth || 10,
+    dir: input.dir,
+    input
+  }
+  await git.clone({ ...fsConfig, ...cmd, ...proxy })
+}
+
+const getAuthor = async (input, plugin: any) => {
+  const author: author = {
+    name: '',
+    email: ''
+  }
+  if (input && input.name && input.email) {
+    author.name = input.name
+    author.email = input.email
+  } else {
+    const username = await plugin.call('config' as any, 'getAppParameter', 'settings/github-user-name')
+    const email = await plugin.call('config' as any, 'getAppParameter', 'settings/github-email')
+    const token = await plugin.call('config' as any, 'getAppParameter', 'settings/gist-access-token')
+    if (username && email) {
+      author.name = username
+      author.email = email
+    } else if (token) {
+
+      const gitHubUser = await isoGit.getGitHubUser({ token })
+
+      if (gitHubUser) {
+        author.name = gitHubUser.user.login
+      }
+    }
+  }
+  return author
+}
+
+
+const getGitHubUser = async(input: { token: string }): Promise<{
+  user: GitHubUser,
+  emails: userEmails,
+  scopes: string[]
+}> => {
+  try {
+    const octokit = new Octokit({
+      auth: input.token
+    })
+
+    const user = await octokit.request('GET /user', {
+      headers: {
+        'X-GitHub-Api-Version': '2022-11-28'
+      }
+    })
+    const emails = await octokit.request('GET /user/emails')
+
+    const scopes = user.headers['x-oauth-scopes'] || ''
+
+    return {
+      user: {
+        ...user.data, isConnected:
+          user.data.login !== undefined && user.data.login !== null && user.data.login !== ''
+      },
+      emails: emails.data,
+      scopes: scopes && scopes.split(',').map(scope => scope.trim())
+    }
+  } catch (e) {
+    return null
+  }
+}
+
+const addIsomorphicGitProxyConfig = async (input: {
+  url?: string,
+  remote?: remote,
+  provider?: 'github' | 'localhost',
+  token?: string,
+}, plugin: any) => {
+
+  const token = await plugin.call('config' as any, 'getAppParameter', 'settings/gist-access-token')
+
+  let config: isoGitProxyConfig = {
+    corsProxy: 'https://corsproxy.remixproject.org/',
+    http,
+    onAuth: url => {
+      url
+      const auth = {
+        username: input.token || token,
+        password: ''
+      }
+      return auth
+    }
+  }
+  if (input.url) {
+
+    const url = new URL(input.url)
+    if (url.hostname.includes('localhost')) {
+      config = {
+        ...config,
+        corsProxy: null
+      }
+    }
+  }
+  if ((input.remote && input.remote.url)) {
+
+    const url = new URL(input.remote.url)
+    if (url.hostname.includes('localhost')) {
+      config = {
+        ...config,
+        corsProxy: null,
+      }
+    }
+  }
+
+  if (input.provider && input.provider === 'github') {
+    config = {
+      ...config,
+      corsProxy: 'https://corsproxy.remixproject.org/',
+    }
+  }
+
+  if (input.provider && input.provider === 'localhost') {
+    config = {
+      ...config,
+      corsProxy: null
+    }
+  }
+
+  return config
+}
+
+const getCommitChanges = async (commitHash1: string, commitHash2: string, fsConfig: isoGitFSConfig) => {
+  const result: commitChange[] = await git.walk({
+    ...fsConfig,
+    trees: [git.TREE({ ref: commitHash1 }), git.TREE({ ref: commitHash2 })],
+    map: async function (filepath, [A, B]) {
+
+      if (filepath === '.') {
+        return
+      }
+      try {
+        if ((A && await A.type()) === 'tree' || B && (await B.type()) === 'tree') {
+          return
+        }
+      } catch (e) {
+        // ignore
+      }
+
+      // generate ids
+      const Aoid = A && await A.oid() || undefined
+      const Boid = B && await B.oid() || undefined
+
+      const commitChange: Partial<commitChange> = {
+        hashModified: commitHash1,
+        hashOriginal: commitHash2,
+        path: filepath,
+      }
+
+      // determine modification type
+      if (Aoid !== Boid) {
+        commitChange.type = "modified"
+      }
+      if (Aoid === undefined) {
+        commitChange.type = "deleted"
+      }
+      if (Boid === undefined || !commitHash2) {
+        commitChange.type = "added"
+      }
+      if (Aoid === undefined && Boid === undefined) {
+        commitChange.type = "unknown"
+      }
+      if (commitChange.type)
+        return commitChange
+      else
+        return undefined
+    },
+  })
+
+  return result
+}
+
+const compareBranches = async ({ branch, remote }: compareBranchesInput, fsConfig: isoGitFSConfig) => {
+  // Get current branch commits
+  const headCommits = await git.log({
+    ...fsConfig,
+    ref: branch.name,
+    depth: 10,
+  });
+
+  // Get remote branch commits
+  const remoteCommits = await git.log({
+    ...fsConfig,
+    ref: `${remote.name}/${branch.name}`,
+    depth: 10,
+  });
+
+  // Convert arrays of commit objects to sets of commit SHAs
+  const headCommitSHAs = new Set(headCommits.map(commit => commit.oid));
+  const remoteCommitSHAs = new Set(remoteCommits.map(commit => commit.oid));
+
+  // Filter out commits that are only in the remote branch
+  const uniqueRemoteCommits = remoteCommits.filter(commit => !headCommitSHAs.has(commit.oid));
+
+  // filter out commits that are only in the local branch
+  const uniqueHeadCommits = headCommits.filter(commit => !remoteCommitSHAs.has(commit.oid));
+
+  return {
+    uniqueHeadCommits,
+    uniqueRemoteCommits,
+  };
+}
+
+export const isoGit = {
+  currentbranch,
+  remotes,
+  branches,
+  getCommitChanges,
+  compareBranches,
+  addIsomorphicGitProxyConfig,
+  push,
+  pull,
+  fetch,
+  getGitHubUser,
+  clone
+}
\ No newline at end of file
diff --git a/libs/remix-lib/package.json b/libs/remix-lib/package.json
index 3dc590e3e8..2f5f7d8938 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.63",
+  "version": "0.5.64",
   "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": "57f4196f41faf8a2879a8013327f5e275e623444",
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-lib/src/execution/txExecution.ts b/libs/remix-lib/src/execution/txExecution.ts
index da8c0248f1..3482a151a7 100644
--- a/libs/remix-lib/src/execution/txExecution.ts
+++ b/libs/remix-lib/src/execution/txExecution.ts
@@ -1,6 +1,7 @@
 'use strict'
 import { ethers } from 'ethers'
 import { getFunctionFragment } from './txHelper'
+import { Transaction } from './txRunner'
 
 /**
   * deploy the given contract
@@ -16,11 +17,11 @@ import { getFunctionFragment } from './txHelper'
   *     [personal mode enabled, need password to continue] promptCb (okCb, cancelCb)
   * @param {Function} finalCallback    - last callback.
   */
-export function createContract (from, data, value, gasLimit, txRunner, callbacks, finalCallback) {
+export function createContract ({ from, data, value, gasLimit, signed }: Transaction, txRunner, callbacks, finalCallback) {
   if (!callbacks.confirmationCb || !callbacks.gasEstimationForceSend || !callbacks.promptCb) {
     return finalCallback('all the callbacks must have been defined')
   }
-  const tx = { from: from, to: null, data: data, useCall: false, value: value, gasLimit: gasLimit }
+  const tx = { from: from, to: null, data: data, useCall: false, value: value, gasLimit: gasLimit, signed }
   txRunner.rawRun(tx, callbacks.confirmationCb, callbacks.gasEstimationForceSend, callbacks.promptCb, (error, txResult) => {
     // see universaldapp.js line 660 => 700 to check possible values of txResult (error case)
     finalCallback(error, txResult)
@@ -42,9 +43,9 @@ export function createContract (from, data, value, gasLimit, txRunner, callbacks
   *     [personal mode enabled, need password to continue] promptCb (okCb, cancelCb)
   * @param {Function} finalCallback    - last callback.
   */
-export function callFunction (from, to, data, value, gasLimit, funAbi, txRunner, callbacks, finalCallback) {
+export function callFunction ({ from, to, data, value, gasLimit, signed }: Transaction, funAbi , txRunner, callbacks, finalCallback) {
   const useCall = funAbi.stateMutability === 'view' || funAbi.stateMutability === 'pure' || funAbi.constant
-  const tx = { from, to, data, useCall, value, gasLimit }
+  const tx = { from, to, data, useCall, value, gasLimit, signed }
   txRunner.rawRun(tx, callbacks.confirmationCb, callbacks.gasEstimationForceSend, callbacks.promptCb, (error, txResult) => {
     // see universaldapp.js line 660 => 700 to check possible values of txResult (error case)
     finalCallback(error, txResult)
diff --git a/libs/remix-lib/src/execution/txRunner.ts b/libs/remix-lib/src/execution/txRunner.ts
index 19f643cc7d..ee2ee5ed2d 100644
--- a/libs/remix-lib/src/execution/txRunner.ts
+++ b/libs/remix-lib/src/execution/txRunner.ts
@@ -3,13 +3,14 @@ import { EventManager } from '../eventManager'
 
 export type Transaction = {
   from: string,
-  to: string,
+  to?: string,
   value: string,
   data: string,
   gasLimit: number,
-  useCall: boolean,
-  timestamp?: number
-  type: '0x1' | '0x2'
+  useCall?: boolean,
+  timestamp?: number,
+  signed?: boolean,
+  type?: '0x1' | '0x2'
 }
 
 export class TxRunner {
@@ -32,9 +33,8 @@ export class TxRunner {
   }
 
   execute (args: Transaction, confirmationCb, gasEstimationForceSend, promptCb, callback) {
-    let data = args.data
-    if (data.slice(0, 2) !== '0x') {
-      data = '0x' + data
+    if (args.data && args.data.slice(0, 2) !== '0x') {
+      args.data = '0x' + args.data
     }
     this.internalRunner.execute(args, confirmationCb, gasEstimationForceSend, promptCb, callback)
   }
diff --git a/libs/remix-lib/src/execution/txRunnerVM.ts b/libs/remix-lib/src/execution/txRunnerVM.ts
index 20f3e43851..6c4c40b27b 100644
--- a/libs/remix-lib/src/execution/txRunnerVM.ts
+++ b/libs/remix-lib/src/execution/txRunnerVM.ts
@@ -69,47 +69,60 @@ export class TxRunnerVM {
     }
 
     try {
-      this.runInVm(args.from, args.to, data, args.value, args.gasLimit, args.useCall, callback)
+      this.runInVm(args, callback)
     } catch (e) {
       callback(e, null)
     }
   }
 
-  async runInVm (from: string, to: string, data: string, value: string, gasLimit: number, useCall: boolean, callback: VMExecutionCallBack) {
+  async runInVm (tx: InternalTransaction, callback: VMExecutionCallBack) {
+    const { to, data, value, gasLimit, useCall, signed } = tx
+    let { from } = tx
     let account
-    if (!from && useCall && Object.keys(this.vmaccounts).length) {
-      from = Object.keys(this.vmaccounts)[0]
-      account = this.vmaccounts[from]
-    } else account = this.vmaccounts[from]
-
-    if (!account) {
-      return callback('Invalid account selected')
-    }
 
     try {
-      const res = await this.getVMObject().stateManager.getAccount(Address.fromString(from))
       const EIP1559 = this.commonContext.hardfork() !== 'berlin' // berlin is the only pre eip1559 fork that we handle.
       let tx
-      if (!EIP1559) {
-        tx = LegacyTransaction.fromTxData({
-          nonce: useCall ? this.nextNonceForCall : res.nonce,
-          gasPrice: '0x1',
-          gasLimit: gasLimit,
-          to: (to as AddressLike),
-          value: (value as BigIntLike),
-          data: hexToBytes(data)
-        }, { common: this.commonContext }).sign(account.privateKey)
-      } else {
-        tx = FeeMarketEIP1559Transaction.fromTxData({
-          nonce: useCall ? this.nextNonceForCall : res.nonce,
-          maxPriorityFeePerGas: '0x01',
-          maxFeePerGas: '0x7',
-          gasLimit: gasLimit,
-          to: (to as AddressLike),
-          value: (value as BigIntLike),
-          data: hexToBytes(data)
-        }).sign(account.privateKey)
+      if (signed) {
+        if (!EIP1559) {
+          tx = LegacyTransaction.fromSerializedTx(hexToBytes(data), { common: this.commonContext })
+        } else {
+          tx = FeeMarketEIP1559Transaction.fromSerializedTx(hexToBytes(data), { common: this.commonContext })
+        }
       }
+      else {
+        if (!from && useCall && Object.keys(this.vmaccounts).length) {
+          from = Object.keys(this.vmaccounts)[0]
+          account = this.vmaccounts[from]
+        } else account = this.vmaccounts[from]
+
+        if (!account) {
+          return callback('Invalid account selected')
+        }
+
+        const res = await this.getVMObject().stateManager.getAccount(Address.fromString(from))
+        if (!EIP1559) {
+          tx = LegacyTransaction.fromTxData({
+            nonce: useCall ? this.nextNonceForCall : res.nonce,
+            gasPrice: '0x1',
+            gasLimit: gasLimit,
+            to: (to as AddressLike),
+            value: (value as BigIntLike),
+            data: hexToBytes(data)
+          }, { common: this.commonContext }).sign(account.privateKey)
+        } else {
+          tx = FeeMarketEIP1559Transaction.fromTxData({
+            nonce: useCall ? this.nextNonceForCall : res.nonce,
+            maxPriorityFeePerGas: '0x01',
+            maxFeePerGas: '0x7',
+            gasLimit: gasLimit,
+            to: (to as AddressLike),
+            value: (value as BigIntLike),
+            data: hexToBytes(data)
+          }).sign(account.privateKey)
+        }
+      }
+
       if (useCall) this.nextNonceForCall++
 
       const coinbases = ['0x0e9281e9c6a0808672eaba6bd1220e144c9bb07a', '0x8945a1288dc78a6d8952a92c77aee6730b414778', '0x94d76e24f818426ae84aa404140e8d5f60e10e7e']
diff --git a/libs/remix-lib/src/execution/txRunnerWeb3.ts b/libs/remix-lib/src/execution/txRunnerWeb3.ts
index 621e1c475a..8b353d6ba9 100644
--- a/libs/remix-lib/src/execution/txRunnerWeb3.ts
+++ b/libs/remix-lib/src/execution/txRunnerWeb3.ts
@@ -1,7 +1,7 @@
 'use strict'
 import { EventManager } from '../eventManager'
 import type { Transaction as InternalTransaction } from './txRunner'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { toBigInt, toHex } from 'web3-utils'
 
 export class TxRunnerWeb3 {
diff --git a/libs/remix-lib/src/index.ts b/libs/remix-lib/src/index.ts
index a2ff565543..bdf52f11d4 100644
--- a/libs/remix-lib/src/index.ts
+++ b/libs/remix-lib/src/index.ts
@@ -21,6 +21,7 @@ export { ICompilerApi, ConfigurationSettings, iSolJsonBinData, iSolJsonBinDataBu
 export { QueryParams } from './query-params'
 export { VMexecutionResult } from './execution/txRunnerVM'
 export { Registry } from './registry'
+export type { Transaction } from './execution/txRunner'
 
 const helpers = {
   ui: uiHelper,
diff --git a/libs/remix-lib/src/init.ts b/libs/remix-lib/src/init.ts
index d22c2392ef..128702cd01 100644
--- a/libs/remix-lib/src/init.ts
+++ b/libs/remix-lib/src/init.ts
@@ -1,5 +1,5 @@
 'use strict'
-import Web3, { Web3PluginBase } from 'web3'
+import { Web3, Web3PluginBase } from 'web3'
 import { toNumber } from 'web3-utils'
 
 export function extendWeb3 (web3) {
diff --git a/libs/remix-lib/src/types/ICompilerApi.ts b/libs/remix-lib/src/types/ICompilerApi.ts
index da8dc3b694..cfb4ce832f 100644
--- a/libs/remix-lib/src/types/ICompilerApi.ts
+++ b/libs/remix-lib/src/types/ICompilerApi.ts
@@ -18,6 +18,7 @@ export interface ICompilerApi {
     setAppParameter: (name: string, value: string | boolean) => void
 
     getFileManagerMode: () => string
+    isDesktop: () => boolean
     setCompilerConfig: (settings: any) => void
 
     getCompilationResult: () => any
diff --git a/libs/remix-simulator/package.json b/libs/remix-simulator/package.json
index fce9106de5..689dfd9055 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.56",
+  "version": "0.2.57",
   "description": "Ethereum IDE and tools for the web",
   "contributors": [
     {
@@ -21,9 +21,9 @@
     "@ethereumjs/common": "4.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
+    "@ethereumjs/vm": "8.1.1",
     "@metamask/eth-sig-util": "^7.0.2",
-    "@remix-project/remix-lib": "^0.5.63",
+    "@remix-project/remix-lib": "^0.5.64",
     "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": "57f4196f41faf8a2879a8013327f5e275e623444",
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01",
   "types": "./src/index.d.ts"
 }
\ No newline at end of file
diff --git a/libs/remix-simulator/src/methods/transactions.ts b/libs/remix-simulator/src/methods/transactions.ts
index 416e2e4ad8..714852f693 100644
--- a/libs/remix-simulator/src/methods/transactions.ts
+++ b/libs/remix-simulator/src/methods/transactions.ts
@@ -63,6 +63,7 @@ export class Transactions {
   methods () {
     return {
       eth_sendTransaction: this.eth_sendTransaction.bind(this),
+      eth_sendRawTransaction: this.eth_sendRawTransaction.bind(this),
       eth_getTransactionReceipt: this.eth_getTransactionReceipt.bind(this),
       eth_getCode: this.eth_getCode.bind(this),
       eth_call: this.eth_call.bind(this),
@@ -80,6 +81,29 @@ export class Transactions {
     }
   }
 
+  eth_sendRawTransaction (payload, cb) {
+    payload.params[0] = { data: payload.params[0], signed: true }
+    processTx(this.txRunnerInstance, payload, false, (error, result: VMexecutionResult) => {
+      if (!error && result) {
+        this.vmContext.addBlock(result.block)
+        const hash = bytesToHex(result.tx.hash())
+        this.vmContext.trackTx(hash, result.block, result.tx)
+        const returnValue = `${bytesToHex(result.result.execResult.returnValue) || '0x0'}`
+        const execResult: VMExecResult = {
+          exceptionError: result.result.execResult.exceptionError,
+          executionGasUsed: result.result.execResult.executionGasUsed,
+          gas: result.result.execResult.gas,
+          gasRefund: result.result.execResult.gasRefund,
+          logs: result.result.execResult.logs,
+          returnValue
+        }
+        this.vmContext.trackExecResult(hash, execResult)
+        return cb(null, result.transactionHash)
+      }
+      cb(error)
+    })
+  }
+
   eth_sendTransaction (payload, cb) {
     // from might be lowercased address (web3)
     if (payload.params && payload.params.length > 0 && payload.params[0].from) {
diff --git a/libs/remix-simulator/src/methods/txProcess.ts b/libs/remix-simulator/src/methods/txProcess.ts
index 61a9821ab5..b2d78092c5 100644
--- a/libs/remix-simulator/src/methods/txProcess.ts
+++ b/libs/remix-simulator/src/methods/txProcess.ts
@@ -1,7 +1,7 @@
-import { execution } from '@remix-project/remix-lib'
+import { execution, Transaction } from '@remix-project/remix-lib'
 const TxExecution = execution.txExecution
 
-function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks, callback) {
+function runCall ({ from, to, data, value, gasLimit, signed }: Transaction, txRunner, callbacks, callback) {
   const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
@@ -9,10 +9,10 @@ function runCall (payload, from, to, data, value, gasLimit, txRunner, callbacks,
     return callback(null, result)
   }
 
-  TxExecution.callFunction(from, to, data, value, gasLimit, { constant: true }, txRunner, callbacks, finalCallback)
+  TxExecution.callFunction({ from, to, data, value, gasLimit, signed }, { constant: true }, txRunner, callbacks, finalCallback)
 }
 
-function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, callback) {
+function runTx ({ from, to, data, value, gasLimit, signed }: Transaction, txRunner, callbacks, callback) {
   const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
@@ -20,10 +20,10 @@ function runTx (payload, from, to, data, value, gasLimit, txRunner, callbacks, c
     callback(null, result)
   }
 
-  TxExecution.callFunction(from, to, data, value, gasLimit, { constant: false }, txRunner, callbacks, finalCallback)
+  TxExecution.callFunction({ from, to, data, value, gasLimit, signed }, { constant: false }, txRunner, callbacks, finalCallback)
 }
 
-function createContract (payload, from, data, value, gasLimit, txRunner, callbacks, callback) {
+function createContract ({ from, data, value, gasLimit, signed }: Transaction, txRunner, callbacks, callback) {
   const finalCallback = function (err, result) {
     if (err) {
       return callback(err)
@@ -31,11 +31,11 @@ function createContract (payload, from, data, value, gasLimit, txRunner, callbac
     callback(null, result)
   }
 
-  TxExecution.createContract(from, data, value, gasLimit, txRunner, callbacks, finalCallback)
+  TxExecution.createContract({ from, data, value, gasLimit, signed }, txRunner, callbacks, finalCallback)
 }
 
 export function processTx (txRunnerInstance, payload, isCall, callback) {
-  let { from, to, data, input, value, gas } = payload.params[0] // eslint-disable-line
+  let { from, to, data, input, value, gas, signed } = payload.params[0] // eslint-disable-line
   gas = gas || 3000000
 
   const callbacks = {
@@ -54,10 +54,10 @@ export function processTx (txRunnerInstance, payload, isCall, callback) {
   }
 
   if (isCall) {
-    runCall(payload, from, to, data||input, value, gas, txRunnerInstance, callbacks, callback)
+    runCall({ from, to, data: data||input, value, gasLimit: gas, signed }, txRunnerInstance, callbacks, callback)
   } else if (to) {
-    runTx(payload, from, to, data||input, value, gas, txRunnerInstance, callbacks, callback)
+    runTx({ from, to, data: data||input, value, gasLimit: gas, signed }, txRunnerInstance, callbacks, callback)
   } else {
-    createContract(payload, from, data||input, value, gas, txRunnerInstance, callbacks, callback)
+    createContract({ from, to: undefined, data: data||input, value, gasLimit: gas, signed }, txRunnerInstance, callbacks, callback)
   }
 }
diff --git a/libs/remix-simulator/test/accounts.ts b/libs/remix-simulator/test/accounts.ts
index 17635383fc..46d1c359f6 100644
--- a/libs/remix-simulator/test/accounts.ts
+++ b/libs/remix-simulator/test/accounts.ts
@@ -1,5 +1,5 @@
 /* global describe, before, it */
-import Web3, { FMT_BYTES, FMT_NUMBER } from 'web3'
+import { Web3, FMT_BYTES, FMT_NUMBER } from 'web3'
 import { Provider } from '../src/index'
 const web3 = new Web3()
 import * as assert from 'assert'
diff --git a/libs/remix-simulator/test/blocks.ts b/libs/remix-simulator/test/blocks.ts
index 7923103edd..e0eb39d6c9 100644
--- a/libs/remix-simulator/test/blocks.ts
+++ b/libs/remix-simulator/test/blocks.ts
@@ -1,5 +1,5 @@
 /* global describe, before, it */
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { Provider } from '../src/index'
 const web3 = new Web3()
 import * as assert from 'assert'
diff --git a/libs/remix-simulator/test/events.ts b/libs/remix-simulator/test/events.ts
index 7d8fad7e9c..cd465caaf3 100644
--- a/libs/remix-simulator/test/events.ts
+++ b/libs/remix-simulator/test/events.ts
@@ -1,5 +1,5 @@
 /* global describe, before, it */
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { Provider } from '../src/index'
 const web3 = new Web3()
 import * as assert from 'assert'
diff --git a/libs/remix-simulator/test/misc.ts b/libs/remix-simulator/test/misc.ts
index 673e98a35b..dbea658c96 100644
--- a/libs/remix-simulator/test/misc.ts
+++ b/libs/remix-simulator/test/misc.ts
@@ -1,5 +1,5 @@
 /* global describe, before, it */
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { Provider } from '../src/index'
 const web3 = new Web3()
 import * as assert from 'assert'
diff --git a/libs/remix-simulator/test/transactions.ts b/libs/remix-simulator/test/transactions.ts
index 88e7a09c05..2fa2da4b4f 100644
--- a/libs/remix-simulator/test/transactions.ts
+++ b/libs/remix-simulator/test/transactions.ts
@@ -1,8 +1,11 @@
 /* global describe, before, it */
-import Web3 from 'web3'
+import { Web3 } from 'web3'
+import { LegacyTransaction, FeeMarketEIP1559Transaction } from '@ethereumjs/tx'
 import { Provider } from '../src/index'
 const web3 = new Web3()
 import * as assert from 'assert'
+import { bytesToHex, hexToBytes } from 'web3-utils'
+import type { AddressLike } from '@ethereumjs/util'
 
 describe('Transactions', () => {
   before(async function () {
@@ -37,4 +40,38 @@ describe('Transactions', () => {
       assert.equal(value, 14)
     })
   })
+
+  describe('eth_sendRawTransaction', () => {
+    it('should deploy a contract and call a function using sendRawTransaction', async function () {
+      const accounts: string[] = await web3.eth.getAccounts()
+
+      const contractCreation = `0x02f908df0105010783069f638080b9088e608060405234801561001057600080fd5b5061005a6040518060400160405280601b81526020017f4f776e657220636f6e7472616374206465706c6f7965642062793a00000000008152503361011a60201b6101e91760201c565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167f342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a73560405160405180910390a3610356565b6101b88282604051602401610130929190610265565b6040516020818303038152906040527f319af333000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506101bc60201b60201c565b5050565b6101dd816101d86101e060201b6102851761020160201b60201c565b60201c565b50565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b61021360201b6102cb17819050919050565b61021b610316565b565b610226816102b1565b82525050565b600061023782610295565b61024181856102a0565b93506102518185602086016102e3565b61025a81610345565b840191505092915050565b6000604082019050818103600083015261027f818561022c565b905061028e602083018461021d565b9392505050565b600081519050919050565b600082825260208201905092915050565b60006102bc826102c3565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b838110156103015780820151818401526020810190506102e6565b83811115610310576000848401525b50505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052605160045260246000fd5b6000601f19601f8301169050919050565b610529806103656000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063893d20e81461003b578063a6f9dae114610059575b600080fd5b610043610075565b6040516100509190610382565b60405180910390f35b610073600480360381019061006e91906102ea565b61009e565b005b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461012c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610123906103cd565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f342827c97908e5e2f71151c08502a66d44b6f758e3ac2f1de95f02eb95f0a73560405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b61028182826040516024016101ff92919061039d565b6040516020818303038152906040527f319af333000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050506102a6565b5050565b60006a636f6e736f6c652e6c6f679050600080835160208501845afa505050565b6102bd816102b56102856102c0565b63ffffffff16565b50565b6102cb819050919050565b6102d361046e565b565b6000813590506102e4816104dc565b92915050565b600060208284031215610300576102ff61049d565b5b600061030e848285016102d5565b91505092915050565b61032081610409565b82525050565b6000610331826103ed565b61033b81856103f8565b935061034b81856020860161043b565b610354816104a2565b840191505092915050565b600061036c6013836103f8565b9150610377826104b3565b602082019050919050565b60006020820190506103976000830184610317565b92915050565b600060408201905081810360008301526103b78185610326565b90506103c66020830184610317565b9392505050565b600060208201905081810360008301526103e68161035f565b9050919050565b600081519050919050565b600082825260208201905092915050565b60006104148261041b565b9050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60005b8381101561045957808201518184015260208101905061043e565b83811115610468576000848401525b50505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052605160045260246000fd5b600080fd5b6000601f19601f8301169050919050565b7f43616c6c6572206973206e6f74206f776e657200000000000000000000000000600082015250565b6104e581610409565b81146104f057600080fd5b5056fea2646970667358221220de534e7b87a9a1d73de47545c783b70d95ffebe049e62821ef2ef1c9a0fd7e8664736f6c63430008070033c080a0e9deb1e1b2cebf79e29cd9e69074f47a6680da51cb175f899a0b8c87aa893fb3a06ab1b35f54e47cd86191accdf8c915f998135c8cb58fccdb85125a9d1d1129da`
+      const receipt = await web3.eth.sendSignedTransaction(contractCreation)
+      // owner should be 0x5B38Da6a701c568545dCfcB03FcB875f56beddC4
+      let value = await web3.eth.call({
+        from: accounts[0],
+        to: receipt.contractAddress,
+        data: '0x893d20e8'
+      })
+      assert.equal(value, '0x0000000000000000000000005B38Da6a701c568545dCfcB03FcB875f56beddC4'.toLowerCase())
+      const tx = FeeMarketEIP1559Transaction.fromTxData({
+        nonce: 1,
+        gasLimit: 1000000,
+        maxPriorityFeePerGas: '0x01',
+        maxFeePerGas: '0x7',
+        to: (hexToBytes(receipt.contractAddress) as AddressLike),
+        value: 0,
+        data: hexToBytes('0xa6f9dae1000000000000000000000000Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2')
+
+      }).sign(hexToBytes('0x503f38a9c967ed597e47fe25643985f032b072db8075426a92110f82df48dfcb'))
+      await web3.eth.sendSignedTransaction(bytesToHex(tx.serialize()))
+      // owner should be 0xAb8483F64d9C6d1EcF9b849Ae677dD3315835cb2
+      value = await web3.eth.call({
+        from: accounts[0],
+        to: receipt.contractAddress,
+        data: '0x893d20e8'
+      })
+      assert.equal(value, '0x000000000000000000000000Ab8483F64d9C6d1EcF9b849Ae677dD3315835cb2'.toLowerCase())
+    })
+  })
 })
diff --git a/libs/remix-solidity/package.json b/libs/remix-solidity/package.json
index b95adccd1a..382c41bf51 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.42",
+  "version": "0.5.43",
   "description": "Tool to load and run Solidity compiler",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -18,8 +18,8 @@
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
-    "@remix-project/remix-lib": "^0.5.63",
+    "@ethereumjs/vm": "8.1.1",
+    "@remix-project/remix-lib": "^0.5.64",
     "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": "57f4196f41faf8a2879a8013327f5e275e623444"
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01"
 }
\ No newline at end of file
diff --git a/libs/remix-tests/package.json b/libs/remix-tests/package.json
index 5b5dc898d6..3628384bc1 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.56",
+  "version": "0.2.57",
   "description": "Tool to test Solidity smart contracts",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -40,10 +40,10 @@
     "@ethereumjs/common": "4.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
-    "@remix-project/remix-lib": "^0.5.63",
-    "@remix-project/remix-simulator": "^0.2.56",
-    "@remix-project/remix-solidity": "^0.5.42",
+    "@ethereumjs/vm": "8.1.1",
+    "@remix-project/remix-lib": "^0.5.64",
+    "@remix-project/remix-simulator": "^0.2.57",
+    "@remix-project/remix-solidity": "^0.5.43",
     "@remix-project/remix-url-resolver": "^0.0.42",
     "ansi-gray": "^0.1.1",
     "async": "^2.6.0",
@@ -81,13 +81,13 @@
     "@ethereumjs/blockchain": "7.3.0",
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/common": "4.4.0",
-    "@ethereumjs/evm": "3.1.0",
+    "@ethereumjs/evm": "3.1.1",
     "@ethereumjs/statemanager": "2.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
+    "@ethereumjs/vm": "8.1.1",
     "@ethereumjs/trie": "6.2.1"
   },
   "typings": "src/index.d.ts",
-  "gitHead": "57f4196f41faf8a2879a8013327f5e275e623444"
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01"
 }
\ No newline at end of file
diff --git a/libs/remix-tests/src/deployer.ts b/libs/remix-tests/src/deployer.ts
index 991847a051..0094784e0a 100644
--- a/libs/remix-tests/src/deployer.ts
+++ b/libs/remix-tests/src/deployer.ts
@@ -1,6 +1,6 @@
 import async from 'async'
 import { execution } from '@remix-project/remix-lib'
-import Web3, { FMT_BYTES, FMT_NUMBER } from 'web3'
+import { Web3, FMT_BYTES, FMT_NUMBER } from 'web3'
 import { compilationInterface } from './types'
 
 /**
diff --git a/libs/remix-tests/src/run.ts b/libs/remix-tests/src/run.ts
index 83fc6c1dc9..b844bb456a 100644
--- a/libs/remix-tests/src/run.ts
+++ b/libs/remix-tests/src/run.ts
@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import path from 'path'
 import axios, { AxiosResponse } from 'axios'
 import { runTestFiles } from './runTestFiles'
diff --git a/libs/remix-tests/src/runTestFiles.ts b/libs/remix-tests/src/runTestFiles.ts
index 3ac058857b..9b1c2bde00 100644
--- a/libs/remix-tests/src/runTestFiles.ts
+++ b/libs/remix-tests/src/runTestFiles.ts
@@ -3,7 +3,7 @@ import fs from './fileSystem'
 import { runTest } from './testRunner'
 import { TestResultInterface, ResultsInterface, CompilerConfiguration, compilationInterface, ASTInterface, Options, AstNode } from './types'
 import colors from 'colors'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { format } from 'util'
 import { compileFileOrFiles } from './compiler'
 import { deployAll } from './deployer'
diff --git a/libs/remix-tests/src/runTestSources.ts b/libs/remix-tests/src/runTestSources.ts
index 7b97b2851c..3464ddb037 100644
--- a/libs/remix-tests/src/runTestSources.ts
+++ b/libs/remix-tests/src/runTestSources.ts
@@ -2,7 +2,7 @@ import async, { ErrorCallback } from 'async'
 import { compileContractSources, writeTestAccountsContract } from './compiler'
 import { deployAll } from './deployer'
 import { runTest } from './testRunner'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { EventEmitter } from 'events'
 import { Provider, extend } from '@remix-project/remix-simulator'
 import {
diff --git a/libs/remix-tests/src/testRunner.ts b/libs/remix-tests/src/testRunner.ts
index 6dcdf239b0..b9e1c5c2d5 100644
--- a/libs/remix-tests/src/testRunner.ts
+++ b/libs/remix-tests/src/testRunner.ts
@@ -1,6 +1,6 @@
 import async from 'async'
 import * as changeCase from 'change-case'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import assertionEvents from './assertionEvents'
 import {
   RunListInterface, TestCbInterface, TestResultInterface, ResultCbInterface,
diff --git a/libs/remix-tests/tests/testRunner.spec.ts b/libs/remix-tests/tests/testRunner.spec.ts
index 3da24b5acd..c5efe8452e 100644
--- a/libs/remix-tests/tests/testRunner.spec.ts
+++ b/libs/remix-tests/tests/testRunner.spec.ts
@@ -1,5 +1,5 @@
 import * as async from 'async'
-import Web3 from 'web3';
+import { Web3 } from 'web3';
 import * as assert from 'assert'
 import { Provider, extend } from '@remix-project/remix-simulator'
 
diff --git a/libs/remix-ui/app/src/index.ts b/libs/remix-ui/app/src/index.ts
index e686172a78..b18c36cb9a 100644
--- a/libs/remix-ui/app/src/index.ts
+++ b/libs/remix-ui/app/src/index.ts
@@ -4,3 +4,4 @@ export { ModalProvider, useDialogDispatchers } from './lib/remix-app/context/pro
 export { AppModal } from './lib/remix-app/interface/index'
 export { AlertModal } from './lib/remix-app/interface/index'
 export { ModalTypes } from './lib/remix-app/types/index'
+export { AppAction, appActionTypes } from './lib/remix-app/actions/app'
diff --git a/libs/remix-ui/app/src/lib/remix-app/actions/app.ts b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
new file mode 100644
index 0000000000..9822635e1e
--- /dev/null
+++ b/libs/remix-ui/app/src/lib/remix-app/actions/app.ts
@@ -0,0 +1,25 @@
+import { GitHubUser } from '@remix-api';
+import { AppModal } from '../interface'
+
+type ActionMap<M extends { [index: string]: any }> = {
+    [Key in keyof M]: M[Key] extends undefined
+      ? {
+          type: Key;
+        }
+      : {
+          type: Key;
+          payload: M[Key];
+        }
+}
+
+export const enum appActionTypes {
+  setGitHubUser = 'SET_GITHUB_USER',
+}
+
+type AppPayload = {
+  [appActionTypes.setGitHubUser]: GitHubUser
+}
+
+export type AppAction = ActionMap<AppPayload>[keyof ActionMap<
+  AppPayload
+>]
diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
index 009cb410b6..7bab81df79 100644
--- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx
@@ -8,6 +8,7 @@ interface IRemixDragBarUi {
   hidden: boolean
   minWidth: number
   maximiseTrigger: number
+  enhanceTrigger: number
   resetTrigger: number
   layoutPosition: 'left' | 'right'
 }
@@ -40,32 +41,36 @@ const DragBar = (props: IRemixDragBarUi) => {
     }
   }, [props.hidden, offset])
 
-  useEffect(() => {
-    if (props.maximiseTrigger > 0) {
-      if (props.layoutPosition === 'left') {
-        const width = 0.4 * window.innerWidth
+  const triggerWidth = (maximiseTrigger, layoutPosition, refObject, coeff) => {
+    if (maximiseTrigger > 0) {
+      if (layoutPosition === 'left') {
+        const width = coeff * window.innerWidth
 
-        if (width > props.refObject.current.offsetWidth) {
-          props.refObject.current.style.width = width + 'px'
-          setTimeout(() => {
-            setDragBarPosX(offset + width)
-          }, 300)
-        }
-      } else if (props.layoutPosition === 'right') {
-        const width = 0.4 * window.innerWidth
+        props.refObject.current.style.width = width + 'px'
+        setTimeout(() => {
+          setDragBarPosX(offset + width)
+        }, 300)
+      } else if (layoutPosition === 'right') {
+        const width = coeff * window.innerWidth
 
-        if (width > props.refObject.current.offsetWidth) {
-          props.refObject.current.style.width = width + 'px'
-          setTimeout(() => {
-            setDragBarPosX(window.innerWidth - width)
-          }, 300)
-        }
+        refObject.current.style.width = width + 'px'
+        setTimeout(() => {
+          setDragBarPosX(window.innerWidth - width)
+        }, 300)
       }
     }
+  }
+
+  useEffect(() => {
+    triggerWidth(props.maximiseTrigger, props.layoutPosition, props.refObject, 0.4)
   }, [props.maximiseTrigger])
 
   useEffect(() => {
-    if (props.maximiseTrigger > 0) {
+    triggerWidth(props.enhanceTrigger, props.layoutPosition, props.refObject, 0.25)
+  }, [props.enhanceTrigger])
+
+  useEffect(() => {
+    if (props.maximiseTrigger > 0 || props.enhanceTrigger) {
       if (props.layoutPosition === 'left') {
         props.refObject.current.style.width = initialWidth.current + 'px'
         setTimeout(() => {
diff --git a/libs/remix-ui/app/src/lib/remix-app/context/context.tsx b/libs/remix-ui/app/src/lib/remix-app/context/context.tsx
index 9fcf53d4a7..8f3fd119ed 100644
--- a/libs/remix-ui/app/src/lib/remix-app/context/context.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/context/context.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
-import { AlertModal, AppModal } from '../interface'
+import { AlertModal, AppModal, AppState } from '../interface'
 import { ModalInitialState } from '../state/modals'
+import { AppAction } from '../actions/app'
 
 export type appProviderContextType = {
   settings: any,
@@ -8,6 +9,8 @@ export type appProviderContextType = {
   showEnter: boolean,
   appManager: any
   modal: any
+  appState: AppState
+  appStateDispatch: React.Dispatch<AppAction>
 }
 
 export enum appPlatformTypes {
diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index 5dacecdf4d..b1cee75257 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -1,3 +1,4 @@
+import { GitHubUser } from '@remix-api'
 import { ModalTypes } from '../types'
 
 export type ValidationResult = {
@@ -45,3 +46,7 @@ export interface forceChoiceModal {
   message: string | JSX.Element,
 }
 
+export interface AppState {
+    gitHubUser: GitHubUser
+}
+
diff --git a/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
new file mode 100644
index 0000000000..2fce1a56cf
--- /dev/null
+++ b/libs/remix-ui/app/src/lib/remix-app/reducer/app.ts
@@ -0,0 +1,13 @@
+import { AppAction, appActionTypes } from "../actions/app";
+import { AppState } from "../interface";
+
+export const appReducer = (state: AppState, action: AppAction): AppState => {
+  switch (action.type) {
+  case appActionTypes.setGitHubUser:{
+    return {
+      ...state,
+      gitHubUser: action.payload
+    }
+  }
+  }
+}
\ No newline at end of file
diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
index 24c42a4318..805f8f3407 100644
--- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
+++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useReducer, useRef, useState } from 'react'
 import './style/remix-app.css'
 import { RemixUIMainPanel } from '@remix-ui/panel'
 import MatomoDialog from './components/modals/matomo'
@@ -12,6 +12,9 @@ import { appProviderContextType, onLineContext, platformContext } from './contex
 import { FormattedMessage, IntlProvider } from 'react-intl'
 import { CustomTooltip } from '@remix-ui/helper'
 import { UsageTypes } from './types'
+import { AppState } from './interface'
+import { appReducer } from './reducer/app'
+import { appInitialState } from './state/app'
 
 declare global {
   interface Window {
@@ -29,8 +32,10 @@ const RemixApp = (props: IRemixAppUi) => {
   const [hideSidePanel, setHideSidePanel] = useState<boolean>(false)
   const [hidePinnedPanel, setHidePinnedPanel] = useState<boolean>(true)
   const [maximiseLeftTrigger, setMaximiseLeftTrigger] = useState<number>(0)
+  const [enhanceLeftTrigger, setEnhanceLeftTrigger] = useState<number>(0)
   const [resetLeftTrigger, setResetLeftTrigger] = useState<number>(0)
   const [maximiseRightTrigger, setMaximiseRightTrigger] = useState<number>(0)
+  const [enhanceRightTrigger, setEnhanceRightTrigger] = useState<number>(0)
   const [resetRightTrigger, setResetRightTrigger] = useState<number>(0)
   const [online, setOnline] = useState<boolean>(true)
   const [locale, setLocale] = useState<{ code: string; messages: any }>({
@@ -40,6 +45,8 @@ const RemixApp = (props: IRemixAppUi) => {
   const sidePanelRef = useRef(null)
   const pinnedPanelRef = useRef(null)
 
+  const [appState, appStateDispatch] = useReducer(appReducer, appInitialState)
+
   useEffect(() => {
     async function activateApp() {
       props.app.themeModule.initTheme(() => {
@@ -93,6 +100,12 @@ const RemixApp = (props: IRemixAppUi) => {
       })
     })
 
+    props.app.layout.event.on('enhancesidepanel', () => {
+      setEnhanceLeftTrigger((prev) => {
+        return prev + 1
+      })
+    })
+
     props.app.layout.event.on('resetsidepanel', () => {
       setResetLeftTrigger((prev) => {
         return prev + 1
@@ -105,6 +118,12 @@ const RemixApp = (props: IRemixAppUi) => {
       })
     })
 
+    props.app.layout.event.on('enhancepinnedpanel', () => {
+      setEnhanceRightTrigger((prev) => {
+        return prev + 1
+      })
+    })
+
     props.app.layout.event.on('resetpinnedpanel', () => {
       setResetRightTrigger((prev) => {
         return prev + 1
@@ -133,7 +152,9 @@ const RemixApp = (props: IRemixAppUi) => {
     showMatamo: props.app.showMatamo,
     appManager: props.app.appManager,
     showEnter: props.app.showEnter,
-    modal: props.app.notification
+    modal: props.app.notification,
+    appState: appState,
+    appStateDispatch: appStateDispatch
   }
 
   const handleUserChosenType = async (type) => {
@@ -198,6 +219,7 @@ const RemixApp = (props: IRemixAppUi) => {
                   {props.app.sidePanel.render()}
                 </div>
                 <DragBar
+                  enhanceTrigger={enhanceLeftTrigger}
                   resetTrigger={resetLeftTrigger}
                   maximiseTrigger={maximiseLeftTrigger}
                   minWidth={305}
@@ -215,6 +237,7 @@ const RemixApp = (props: IRemixAppUi) => {
                 {
                   !hidePinnedPanel &&
                   <DragBar
+                    enhanceTrigger={enhanceRightTrigger}
                     resetTrigger={resetRightTrigger}
                     maximiseTrigger={maximiseRightTrigger}
                     minWidth={331}
diff --git a/libs/remix-ui/app/src/lib/remix-app/state/app.ts b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
new file mode 100644
index 0000000000..1e76098bdc
--- /dev/null
+++ b/libs/remix-ui/app/src/lib/remix-app/state/app.ts
@@ -0,0 +1,6 @@
+import { GitHubUser } from "@remix-api";
+import { AppState } from "../interface";
+
+export const appInitialState: AppState = {
+  gitHubUser: {} as GitHubUser,
+}
\ No newline at end of file
diff --git a/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts
index 0f444a7464..45db6dfbf1 100644
--- a/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts
+++ b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { init , traceHelper, TransactionDebugger as Debugger } from '@remix-project/remix-debug'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import { lineText } from '@remix-ui/editor'
diff --git a/libs/remix-ui/editor/src/lib/remix-plugin-types.ts b/libs/remix-ui/editor/src/lib/remix-plugin-types.ts
index 9e55e5b55d..6f605f829a 100644
--- a/libs/remix-ui/editor/src/lib/remix-plugin-types.ts
+++ b/libs/remix-ui/editor/src/lib/remix-plugin-types.ts
@@ -380,7 +380,6 @@ declare interface IDgitSystem {
         status(cmd: any): any[];
         rm(cmd: any): string;
         log(cmd: any): any[];
-        lsfiles(cmd: any): any[];
         readblob(cmd: any): { oid: string, blob: Uint8Array }
         resolveref(cmd: any): string
         branch(cmd: any): void
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 2a313ff8b0..77f75dfa9a 100644
--- a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
+++ b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -925,6 +925,7 @@ export const EditorUI = (props: EditorUIProps) => {
       if (freeFunctionNode) {
         executeFreeFunctionAction.label = intl.formatMessage({ id: 'editor.executeFreeFunction2' }, { name: freeFunctionNode.name })
         freeFunctionAction = editor.addAction(executeFreeFunctionAction)
+        freeFunctionCondition.set(true)
       }
 
       const functionImpl = nodesAtPosition.find((node) => node.kind === 'function')
@@ -944,7 +945,6 @@ export const EditorUI = (props: EditorUIProps) => {
         executeSolgptExplainFunctionAction.label = intl.formatMessage({ id: 'editor.explainFunctionSol' })
         solgptExplainFunctionAction = editor.addAction(executeSolgptExplainFunctionAction)
       }
-      freeFunctionCondition.set(!!freeFunctionNode)
     }
     contextmenu._onContextMenu = (...args) => {
       if (args[0]) args[0].event?.preventDefault()
diff --git a/libs/remix-ui/git/src/components/buttons/sourceControlBase.tsx b/libs/remix-ui/git/src/components/buttons/sourceControlBase.tsx
index 36f2da120f..628e57f0fb 100644
--- a/libs/remix-ui/git/src/components/buttons/sourceControlBase.tsx
+++ b/libs/remix-ui/git/src/components/buttons/sourceControlBase.tsx
@@ -5,7 +5,7 @@ import { ReadCommitResult } from "isomorphic-git"
 import React, { createContext, useEffect, useState } from "react"
 import { FormattedMessage } from "react-intl"
 import { gitActionsContext } from "../../state/context"
-import { branch, remote } from "../../types"
+import { branch, remote } from "@remix-api"
 import { gitPluginContext } from "../gitui"
 import GitUIButton from "./gituibutton"
 
diff --git a/libs/remix-ui/git/src/components/buttons/sourcecontrolbuttons.tsx b/libs/remix-ui/git/src/components/buttons/sourcecontrolbuttons.tsx
index 250e44628c..7aa8705e2a 100644
--- a/libs/remix-ui/git/src/components/buttons/sourcecontrolbuttons.tsx
+++ b/libs/remix-ui/git/src/components/buttons/sourcecontrolbuttons.tsx
@@ -1,16 +1,21 @@
-import { faArrowDown, faArrowUp, faArrowsUpDown, faArrowRotateRight } from "@fortawesome/free-solid-svg-icons"
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
-import { CustomTooltip } from "@remix-ui/helper"
-import React, { useEffect, useState } from "react"
-import { FormattedMessage } from "react-intl"
-import { gitActionsContext } from "../../state/context"
-import { branch, gitMatomoEventTypes, remote } from "../../types"
-import { gitPluginContext } from "../gitui"
-import GitUIButton from "./gituibutton"
-import { syncStateContext } from "./sourceControlBase"
-import { sendToMatomo } from "../../lib/pluginActions"
+import { faArrowDown, faArrowUp, faArrowsUpDown, faArrowRotateRight } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { CustomTooltip } from '@remix-ui/helper'
+import React, { useEffect, useState } from 'react'
+import { FormattedMessage } from 'react-intl'
+import { gitActionsContext } from '../../state/context'
+import { branch, remote } from '@remix-api'
+import { defaultGitState, gitMatomoEventTypes, gitUIPanels } from '../../types'
+import { gitPluginContext } from '../gitui'
+import GitUIButton from './gituibutton'
+import { syncStateContext } from './sourceControlBase'
+import { sendToMatomo } from '../../lib/pluginActions'
 
-export const SourceControlButtons = () => {
+export interface SourceControlButtonsProps {
+  panel: string
+}
+
+export const SourceControlButtons = (props: SourceControlButtonsProps) => {
   const context = React.useContext(gitPluginContext)
   const actions = React.useContext(gitActionsContext)
   const syncState = React.useContext(syncStateContext)
@@ -28,21 +33,21 @@ export const SourceControlButtons = () => {
   const pull = async () => {
     await actions.pull({
       remote: getRemote(),
-      ref: branch ? branch : context.currentBranch
+      ref: branch ? branch : context.currentBranch,
     })
   }
 
   const push = async () => {
     await actions.push({
       remote: getRemote(),
-      ref: branch ? branch : context.currentBranch
+      ref: branch ? branch : context.currentBranch,
     })
     await actions.fetch({
       remote: getRemote(),
       ref: branch ? branch : context.currentBranch,
       relative: false,
       depth: 1,
-      singleBranch: true
+      singleBranch: true,
     })
   }
 
@@ -51,50 +56,63 @@ export const SourceControlButtons = () => {
     await push()
   }
 
-  const refresh = async() => {
+  const refresh = async () => {
     await sendToMatomo(gitMatomoEventTypes.REFRESH)
     await actions.getFileStatusMatrix(null)
-    await actions.gitlog()
+    if (props.panel === gitUIPanels.BRANCHES) {
+      await actions.getBranches()
+    }
+    if (props.panel === gitUIPanels.COMMITS) {
+      await actions.gitlog(defaultGitState.gitLogCount)
+    }
+    actions.setStateGitLogCount(defaultGitState.gitLogCount)
   }
 
   const buttonsDisabled = () => {
-    return (!context.upstream) || context.remotes.length === 0
+    return !context.upstream || context.remotes.length === 0
   }
 
   const getTooltipText = (id: string) => {
     if (buttonsDisabled()) return <FormattedMessage id="git.noremote" />
-    return <><FormattedMessage id={id} /> {getRemoteName()}</>
+    return (
+      <>
+        <FormattedMessage id={id} /> {getRemoteName()}
+      </>
+    )
   }
 
   return (
-    <span className='d-flex justify-content-end align-items-center'>
-      <CustomTooltip tooltipText={getTooltipText('git.pull')}>
-        <GitUIButton data-id='sourcecontrol-button-pull' disabledCondition={buttonsDisabled()} onClick={pull} className='btn btn-sm pl-0 pr-2'>
-          <div className="d-flex align-items-baseline">
-            {syncState.commitsBehind.length ? <div className="badge badge-pill pl-0">
-              {syncState.commitsBehind.length}
-            </div> : null}
-            <FontAwesomeIcon icon={faArrowDown} className="" />
-          </div>
-        </GitUIButton>
-      </CustomTooltip>
-      <CustomTooltip tooltipText={getTooltipText('git.push')}>
-        <GitUIButton data-id='sourcecontrol-button-push' disabledCondition={buttonsDisabled()} onClick={push} className='btn btn-sm pl-0 pr-2'>
-          <div className="d-flex align-items-baseline">
-            {syncState.commitsAhead.length ? <div className="badge badge-pill pl-0">
-              {syncState.commitsAhead.length}
-            </div> : null}
-            <FontAwesomeIcon icon={faArrowUp} className="" />
-          </div>
-        </GitUIButton>
-      </CustomTooltip>
-      <CustomTooltip tooltipText={getTooltipText('git.sync')}>
-        <GitUIButton data-id='sourcecontrol-button-sync' disabledCondition={buttonsDisabled()} onClick={sync} className='btn btn-sm  pl-0 pr-2'><FontAwesomeIcon icon={faArrowsUpDown} className="" /></GitUIButton>
-      </CustomTooltip>
+    <span className="d-flex justify-content-end align-items-center">
+      {props.panel === gitUIPanels.COMMITS || props.panel === gitUIPanels.SOURCECONTROL ? (
+        <>
+          <CustomTooltip tooltipText={getTooltipText('git.pull')}>
+            <GitUIButton data-id="sourcecontrol-button-pull" disabledCondition={buttonsDisabled()} onClick={pull} className="btn btn-sm pl-0 pr-2">
+              <div className="d-flex align-items-baseline">
+                {syncState.commitsBehind.length ? <div className="badge badge-pill pl-0">{syncState.commitsBehind.length}</div> : null}
+                <FontAwesomeIcon icon={faArrowDown} className="" />
+              </div>
+            </GitUIButton>
+          </CustomTooltip>
+          <CustomTooltip tooltipText={getTooltipText('git.push')}>
+            <GitUIButton data-id="sourcecontrol-button-push" disabledCondition={buttonsDisabled()} onClick={push} className="btn btn-sm pl-0 pr-2">
+              <div className="d-flex align-items-baseline">
+                {syncState.commitsAhead.length ? <div className="badge badge-pill pl-0">{syncState.commitsAhead.length}</div> : null}
+                <FontAwesomeIcon icon={faArrowUp} className="" />
+              </div>
+            </GitUIButton>
+          </CustomTooltip>
+          <CustomTooltip tooltipText={getTooltipText('git.sync')}>
+            <GitUIButton data-id="sourcecontrol-button-sync" disabledCondition={buttonsDisabled()} onClick={sync} className="btn btn-sm  pl-0 pr-2">
+              <FontAwesomeIcon icon={faArrowsUpDown} className="" />
+            </GitUIButton>
+          </CustomTooltip>
+        </>
+      ) : null}
       <CustomTooltip tooltipText={<FormattedMessage id="git.refresh" />}>
-        <GitUIButton onClick={refresh} className='btn btn-sm'><FontAwesomeIcon icon={faArrowRotateRight} className="" /></GitUIButton>
+        <GitUIButton onClick={refresh} className="btn btn-sm">
+          <FontAwesomeIcon icon={faArrowRotateRight} className="" />
+        </GitUIButton>
       </CustomTooltip>
     </span>
-
   )
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/git/src/components/disabled.tsx b/libs/remix-ui/git/src/components/disabled.tsx
index fbd54d6177..1f03413be9 100644
--- a/libs/remix-ui/git/src/components/disabled.tsx
+++ b/libs/remix-ui/git/src/components/disabled.tsx
@@ -1,12 +1,30 @@
-import React, { useEffect, useState } from 'react'
+import { appPlatformTypes, platformContext } from '@remix-ui/app'
+import React, { useEffect, useState, useContext } from 'react'
+import { FormattedMessage } from "react-intl"
+import { pluginActionsContext } from '../state/context'
+import { openCloneDialog, openFolderInSameWindow } from '../lib/pluginActions'
 
 export const Disabled = () => {
+  const platform = useContext(platformContext)
 
-  return (
-    <div data-id='disabled' className='text-sm w-100 alert alert-warning'>
-            Git is currently disabled.<br></br>
-            If you are using RemixD you can use git on the terminal.<br></br>
-    </div>
-  )
+  const openFolderElectron = async (path: string) => {
+    await openFolderInSameWindow(path)
+  }
+
+  const clone = async () => {
+    openCloneDialog()
+  }
 
+  return (
+    (platform === appPlatformTypes.desktop) ?
+      <div className='p-1'>
+        <div><FormattedMessage id="gitui.openFolderMessage"/></div>
+        <div data-id="openFolderButtonInDisabled" onClick={async () => { await openFolderElectron(null) }} className='btn btn-primary w-100 my-1'><FormattedMessage id="electron.openFolder" /></div>
+        <div data-id="cloneButton" onClick={async () => { await clone() }} className='btn btn-primary w-100'><FormattedMessage id="electron.gitClone" /></div>
+      </div>
+      :
+      <div data-id='disabled' className='text-sm w-100 alert alert-warning'>
+        Git is currently disabled.<br></br>
+        If you are using RemixD you can use git on the terminal.<br></br>
+      </div>)
 }
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/components/github/devicecode.tsx b/libs/remix-ui/git/src/components/github/devicecode.tsx
index 85922441fd..3af8ab06df 100644
--- a/libs/remix-ui/git/src/components/github/devicecode.tsx
+++ b/libs/remix-ui/git/src/components/github/devicecode.tsx
@@ -65,7 +65,6 @@ export const GetDeviceCode = () => {
     } else {
       await sendToMatomo(gitMatomoEventTypes.CONNECTTOGITHUBFAIL)
     }
-
   }
 
   const disconnect = async () => {
@@ -78,11 +77,11 @@ export const GetDeviceCode = () => {
 
   return (
     <>
-      {(context.gitHubUser && context.gitHubUser.login) ? null : <>
+      {(context.gitHubUser && context.gitHubUser.isConnected) ? null : <>
         <label className="text-uppercase">Connect to GitHub</label>
         <button className='btn btn-secondary mt-1 w-100' onClick={async () => {
           await getDeviceCodeFromGitHub()
-        }}><i className="fab fa-github mr-1"></i>Login in with github</button></>
+        }}><i className="fab fa-github mr-1"></i>Login with GitHub</button></>
       }
       {gitHubResponse && !authorized &&
         <div className="pt-2">
@@ -105,15 +104,15 @@ export const GetDeviceCode = () => {
         </div>
       }
       {
-        (context.gitHubUser && context.gitHubUser.login) ?
+        (context.gitHubUser && context.gitHubUser.isConnected) ?
           <div className="pt-2">
-            <button className='btn btn-primary mt-1 w-100' onClick={async () => {
+            <button data-id='disconnect-github' className='btn btn-primary mt-1 w-100' onClick={async () => {
               disconnect()
             }}>Disconnect</button>
           </div> : null
       }
       {
-        (context.gitHubUser && context.gitHubUser.login) ?
+        (context.gitHubUser && context.gitHubUser.isConnected) ?
           <div className="pt-2">
 
             <div className="mb-1" data-id={`connected-as-${context.gitHubUser.login}`}>Connected as {context.gitHubUser.login}</div>
diff --git a/libs/remix-ui/git/src/components/github/repositoryselect.tsx b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
index 40a9d7b4a3..72b055ba9a 100644
--- a/libs/remix-ui/git/src/components/github/repositoryselect.tsx
+++ b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react';
 import Select from 'react-select';
 import { gitActionsContext } from '../../state/context';
-import { gitMatomoEventTypes, repository } from '../../types';
+import { repository } from '@remix-api';
+import { gitMatomoEventTypes } from '../../types';
 import { selectStyles, selectTheme } from '../../types/styles';
 import { gitPluginContext } from '../gitui';
 import { sendToMatomo } from '../../lib/pluginActions';
diff --git a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
index 5557c3f13b..9c3e879c71 100644
--- a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
+++ b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { gitActionsContext } from "../../state/context";
-import { repository } from "../../types";
+import { repository } from "@remix-api";
 import { gitPluginContext } from "../gitui";
 import RepositorySelect from "./repositoryselect";
 import { BranchSelect } from "./branchselect";
diff --git a/libs/remix-ui/git/src/components/gitui.tsx b/libs/remix-ui/git/src/components/gitui.tsx
index f5d1460487..b7444e0b8d 100644
--- a/libs/remix-ui/git/src/components/gitui.tsx
+++ b/libs/remix-ui/git/src/components/gitui.tsx
@@ -1,11 +1,11 @@
-import React, { useEffect, useReducer, useState } from 'react'
-import { add, addall, checkout, checkoutfile, clone, commit, createBranch, remoteBranches, repositories, rm, getCommitChanges, diff, resolveRef, getBranchCommits, setUpstreamRemote, loadGitHubUserFromToken, getBranches, getRemotes, remoteCommits, saveGitHubCredentials, getGitHubCredentialsFromLocalStorage, fetch, pull, push, setDefaultRemote, addRemote, removeRemote, sendToGitLog, clearGitLog, getBranchDifferences, getFileStatusMatrix, init, showAlert, gitlog } from '../lib/gitactions'
+import React, { useEffect, useReducer, useState, useContext } from 'react'
+import { add, addall, checkout, checkoutfile, clone, commit, createBranch, remoteBranches, repositories, rm, getCommitChanges, diff, resolveRef, getBranchCommits, setUpstreamRemote, loadGitHubUserFromToken, getBranches, getRemotes, remoteCommits, saveGitHubCredentials, getGitHubCredentialsFromLocalStorage, fetch, pull, push, setDefaultRemote, addRemote, removeRemote, sendToGitLog, clearGitLog, getBranchDifferences, getFileStatusMatrix, init, showAlert, gitlog, setStateGitLogCount } from '../lib/gitactions'
 import { loadFiles, setCallBacks } from '../lib/listeners'
-import { openDiff, openFile, saveToken, sendToMatomo, setModifiedDecorator, setPlugin, setUntrackedDecorator, statusChanged } from '../lib/pluginActions'
+import { openDiff, openFile, openFolderInSameWindow, sendToMatomo, saveToken, setModifiedDecorator, setPlugin, setUntrackedDecorator, statusChanged } from '../lib/pluginActions'
 import { gitActionsContext, pluginActionsContext } from '../state/context'
 import { gitReducer } from '../state/gitreducer'
-import { defaultGitState, defaultLoaderState, gitMatomoEventTypes, gitState, gitUIPanels, loaderState } from '../types'
-import { Accordion } from "react-bootstrap";
+import { IGitUi, defaultGitState, defaultLoaderState, gitMatomoEventTypes, gitState, gitUIPanels, loaderState } from '../types'
+import { Accordion, Button } from "react-bootstrap";
 import { CommitMessage } from './buttons/commitmessage'
 import { Commits } from './panels/commits'
 import { Branches } from './panels/branches'
@@ -19,7 +19,6 @@ import { Commands } from './panels/commands'
 import { CommandsNavigation } from './navigation/commands'
 import { RemotesNavigation } from './navigation/remotes'
 import { Remotes } from './panels/remotes'
-import { ViewPlugin } from '@remixproject/engine-web'
 import { GitHubNavigation } from './navigation/github'
 import { loaderReducer } from '../state/loaderReducer'
 import { GetDeviceCode } from './github/devicecode'
@@ -31,17 +30,13 @@ import { SourceControl } from './panels/sourcontrol'
 import { GitHubCredentials } from './panels/githubcredentials'
 import { Setup } from './panels/setup'
 import { Init } from './panels/init'
-import { CustomRemixApi } from "@remix-api"
-import { Plugin } from "@remixproject/engine"
 import { Disabled } from './disabled'
+import { AppContext, appPlatformTypes, platformContext } from '@remix-ui/app'
+import { Version } from './panels/version'
 
 export const gitPluginContext = React.createContext<gitState>(defaultGitState)
 export const loaderContext = React.createContext<loaderState>(defaultLoaderState)
 
-interface IGitUi {
-  plugin: Plugin<any, CustomRemixApi>
-}
-
 export const GitUI = (props: IGitUi) => {
   const plugin = props.plugin
   const [gitState, gitDispatch] = useReducer(gitReducer, defaultGitState)
@@ -50,6 +45,9 @@ export const GitUI = (props: IGitUi) => {
   const [setup, setSetup] = useState<boolean>(false)
   const [needsInit, setNeedsInit] = useState<boolean>(true)
   const [appLoaded, setAppLoaded] = useState<boolean>(false)
+  const appContext = useContext(AppContext)
+
+  const platform = useContext(platformContext)
 
   useEffect(() => {
     plugin.emit('statusChanged', {
@@ -64,12 +62,17 @@ export const GitUI = (props: IGitUi) => {
 
   useEffect(() => {
     if (!appLoaded) return
-    setCallBacks(plugin, gitDispatch, loaderDispatch, setActivePanel)
+    setCallBacks(plugin, gitDispatch, appContext.appStateDispatch, loaderDispatch, setActivePanel, platform)
     setPlugin(plugin, gitDispatch, loaderDispatch)
     loaderDispatch({ type: 'plugin', payload: true })
 
   }, [appLoaded])
 
+  useEffect(() => {
+    if (!appLoaded) return
+    gitlog(gitState.gitLogCount)
+  }, [gitState.timestamp, gitState.gitLogCount])
+
   useEffect(() => {
     if (!appLoaded) return
     async function checkconfig() {
@@ -155,7 +158,8 @@ export const GitUI = (props: IGitUi) => {
     clearGitLog,
     getFileStatusMatrix,
     gitlog,
-    init
+    init,
+    setStateGitLogCount
   }
 
   const pluginActionsProviderValue = {
@@ -166,7 +170,8 @@ export const GitUI = (props: IGitUi) => {
     saveToken,
     saveGitHubCredentials,
     getGitHubCredentialsFromLocalStorage,
-    showAlert
+    showAlert,
+    openFolderInSameWindow
   }
 
   return (
@@ -177,13 +182,10 @@ export const GitUI = (props: IGitUi) => {
             <gitActionsContext.Provider value={gitActionsProviderValue}>
               <pluginActionsContext.Provider value={pluginActionsProviderValue}>
                 <BranchHeader />
-
-                {setup && !needsInit ? <Setup></Setup> : null}
-                {needsInit ? <Init></Init> : null}
-                {!setup && !needsInit ?
-                  <Accordion activeKey={activePanel} defaultActiveKey="0" className="">
+                {setup ? <Setup callback={setActivePanel}></Setup> : null}
+                <Accordion activeKey={activePanel} defaultActiveKey="0" className="">
+                  {!setup && !needsInit ? <>
                     <SourceControlNavigation eventKey={gitUIPanels.SOURCECONTROL} activePanel={activePanel} callback={setActivePanel} />
-
                     <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.SOURCECONTROL}>
                       <div className="px-2 py-2">
                         <SourceControlBase><CommitMessage /></SourceControlBase>
@@ -219,30 +221,34 @@ export const GitUI = (props: IGitUi) => {
                       </div>
                     </Accordion.Collapse>
                     <hr></hr>
-                    <CloneNavigation eventKey={gitUIPanels.CLONE} activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.CLONE}>
-                      <div className="px-2 py-2">
-                        <Clone /></div>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <GitHubNavigation eventKey={gitUIPanels.GITHUB} activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.GITHUB}>
-                      <div className="px-2 py-2">
-                        <GetDeviceCode></GetDeviceCode>
-                        <hr></hr>
-                        <GitHubCredentials></GitHubCredentials>
-                      </div>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <LogNavigation eventKey={gitUIPanels.LOG} activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.LOG}>
-                      <div className="px-2 py-2">
-                        <LogViewer />
-                      </div>
-                    </Accordion.Collapse>
+                  </> : null}
+                  {needsInit ? <>
+                    <Init /></> : null}
+                  <CloneNavigation eventKey={gitUIPanels.CLONE} activePanel={activePanel} callback={setActivePanel} />
+                  <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.CLONE}>
+                    <div className="px-2 py-2">
+                      <Clone /></div>
+                  </Accordion.Collapse>
+                  <hr></hr>
 
-                  </Accordion>
-                  : null}
+                  <GitHubNavigation eventKey={gitUIPanels.GITHUB} activePanel={activePanel} callback={setActivePanel} />
+                  <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.GITHUB}>
+                    <div className="px-2 py-2">
+                      <GetDeviceCode></GetDeviceCode>
+                      <hr></hr>
+                      <GitHubCredentials></GitHubCredentials>
+                    </div>
+                  </Accordion.Collapse>
+                  <hr></hr>
+                  <LogNavigation eventKey={gitUIPanels.LOG} activePanel={activePanel} callback={setActivePanel} />
+                  <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.LOG}>
+                    <div className="px-2 py-2">
+                      <LogViewer />
+                    </div>
+                  </Accordion.Collapse>
+                </Accordion>
+                { platform === appPlatformTypes.desktop &&
+                <Version /> }
               </pluginActionsContext.Provider>
             </gitActionsContext.Provider>
           </loaderContext.Provider>
diff --git a/libs/remix-ui/git/src/components/navigation/branchedetails.tsx b/libs/remix-ui/git/src/components/navigation/branchedetails.tsx
index 2407e5a071..0eeac2c0c2 100644
--- a/libs/remix-ui/git/src/components/navigation/branchedetails.tsx
+++ b/libs/remix-ui/git/src/components/navigation/branchedetails.tsx
@@ -2,7 +2,7 @@ import { faCaretUp, faCaretDown, faCaretRight, faArrowUp, faArrowDown, faArrowRo
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import React, { useContext, useEffect } from "react";
 import { gitActionsContext } from "../../state/context";
-import { branch } from "../../types";
+import { branch } from "@remix-api";
 import GitUIButton from "../buttons/gituibutton";
 import { gitPluginContext } from "../gitui";
 import { removeGitFromUrl } from "../../utils";
@@ -64,7 +64,7 @@ export const BrancheDetailsNavigation = (props: BrancheDetailsNavigationProps) =
   return (
     <>
       <div className="d-flex flex-row w-100 mb-2 mt-2">
-        <div data-id={`branches-${context.currentBranch.name === branch.name ? 'current-' : ''}branch-${branch.name}`} onClick={() => handleClick()} role={'button'} className='pointer d-flex flex-row w-100 commit-navigation'>
+        <div data-type='branches-branch' data-id={`branches-${context.currentBranch.name === branch.name ? 'current-' : ''}branch-${branch.name}`} onClick={() => handleClick()} role={'button'} className='pointer d-flex flex-row w-100 commit-navigation'>
           {
             activePanel === eventKey ? <FontAwesomeIcon className='' icon={faCaretDown}></FontAwesomeIcon> : <FontAwesomeIcon className='' icon={faCaretRight}></FontAwesomeIcon>
           }
diff --git a/libs/remix-ui/git/src/components/navigation/branches.tsx b/libs/remix-ui/git/src/components/navigation/branches.tsx
index 21decc6e7a..be02305932 100644
--- a/libs/remix-ui/git/src/components/navigation/branches.tsx
+++ b/libs/remix-ui/git/src/components/navigation/branches.tsx
@@ -3,6 +3,9 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import React, { } from "react";
 import { gitActionsContext, pluginActionsContext } from "../../state/context";
 import LoaderIndicator from "./loaderindicator";
+import { gitUIPanels } from "../../types";
+import { SourceControlBase } from "../buttons/sourceControlBase";
+import { SourceControlButtons } from "../buttons/sourcecontrolbuttons";
 
 export const BranchesNavigation = ({ eventKey, activePanel, callback }) => {
   const pluginactions = React.useContext(pluginActionsContext)
@@ -26,6 +29,7 @@ export const BranchesNavigation = ({ eventKey, activePanel, callback }) => {
           <label className="pl-2 nav form-check-label">BRANCHES</label>
           <LoaderIndicator></LoaderIndicator>
         </span>
+        <SourceControlBase><SourceControlButtons panel={gitUIPanels.BRANCHES}/></SourceControlBase>
       </div>
     </>
   );
diff --git a/libs/remix-ui/git/src/components/navigation/commitdetails.tsx b/libs/remix-ui/git/src/components/navigation/commitdetails.tsx
index 2e49875f52..8848aae460 100644
--- a/libs/remix-ui/git/src/components/navigation/commitdetails.tsx
+++ b/libs/remix-ui/git/src/components/navigation/commitdetails.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import React, { useContext, useEffect } from "react";
 import { CommitSummary } from "../panels/commits/commitsummary";
 import { ReadCommitResult } from "isomorphic-git"
-import { branch } from "../../types";
+import { branch } from "@remix-api";
 
 interface CommitDetailsNavigationProps {
   commit: ReadCommitResult,
diff --git a/libs/remix-ui/git/src/components/navigation/commits.tsx b/libs/remix-ui/git/src/components/navigation/commits.tsx
index 08798b4576..85c7dd1815 100644
--- a/libs/remix-ui/git/src/components/navigation/commits.tsx
+++ b/libs/remix-ui/git/src/components/navigation/commits.tsx
@@ -4,11 +4,12 @@ import { CustomTooltip } from "@remix-ui/helper";
 import React, { useEffect } from "react";
 import { FormattedMessage } from "react-intl";
 import { pluginActionsContext } from "../../state/context";
-import { branch, remote } from "../../types";
+import { branch, remote } from "@remix-api";
 import { SourceControlBase } from "../buttons/sourceControlBase";
 import { SourceControlButtons } from "../buttons/sourcecontrolbuttons";
 import { gitPluginContext } from "../gitui";
 import LoaderIndicator from "./loaderindicator";
+import { gitUIPanels } from "../../types";
 
 export interface CommitsNavigationProps {
   title: string,
@@ -53,7 +54,7 @@ export const CommitsNavigation = ({ eventKey, activePanel, callback, title, bran
         </span>
         {showButtons ?
           <SourceControlBase branch={branch} remote={remote}>
-            <SourceControlButtons />
+            <SourceControlButtons panel={gitUIPanels.COMMITS} />
           </SourceControlBase> : null}
 
       </div>
diff --git a/libs/remix-ui/git/src/components/navigation/loaderindicator.tsx b/libs/remix-ui/git/src/components/navigation/loaderindicator.tsx
index 8c13e101b3..ee5e44aff0 100644
--- a/libs/remix-ui/git/src/components/navigation/loaderindicator.tsx
+++ b/libs/remix-ui/git/src/components/navigation/loaderindicator.tsx
@@ -13,7 +13,7 @@ const LoaderIndicator = ({ type, isLoadingCondition }: LoaderIndicatorProps) =>
   const isLoading = loading || isLoadingCondition
   if (!isLoading) return null
   return (
-    <i style={{ fontSize: 'x-small' }} className="ml-1 fas fa-spinner fa-spin fa-4x"></i>
+    <i data-id='loader-indicator' style={{ fontSize: 'x-small' }} className="ml-1 fas fa-spinner fa-spin fa-4x"></i>
   );
 };
 
diff --git a/libs/remix-ui/git/src/components/navigation/remotesdetails.tsx b/libs/remix-ui/git/src/components/navigation/remotesdetails.tsx
index 626834feb1..4a702b1193 100644
--- a/libs/remix-ui/git/src/components/navigation/remotesdetails.tsx
+++ b/libs/remix-ui/git/src/components/navigation/remotesdetails.tsx
@@ -3,7 +3,8 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { CustomTooltip } from "@remix-ui/helper";
 import React, { useContext, useEffect } from "react";
 import { gitActionsContext } from "../../state/context";
-import { branch, gitMatomoEventTypes, remote } from "../../types";
+import { remote } from "@remix-api";
+import { gitMatomoEventTypes } from "../../types";
 import GitUIButton from "../buttons/gituibutton";
 import { gitPluginContext } from "../gitui";
 import { removeGitFromUrl } from "../../utils";
diff --git a/libs/remix-ui/git/src/components/navigation/sourcecontrol.tsx b/libs/remix-ui/git/src/components/navigation/sourcecontrol.tsx
index 7baf2f50e1..9f66bc9314 100644
--- a/libs/remix-ui/git/src/components/navigation/sourcecontrol.tsx
+++ b/libs/remix-ui/git/src/components/navigation/sourcecontrol.tsx
@@ -9,6 +9,7 @@ import { SourceControlButtons } from "../buttons/sourcecontrolbuttons";
 import { gitPluginContext } from "../gitui";
 import LoaderIndicator from "./loaderindicator";
 import { SourceControlMenu } from "./menu/sourcecontrolmenu";
+import { gitUIPanels } from "../../types";
 
 export const SourceControlNavigation = ({ eventKey, activePanel, callback }) => {
   const pluginactions = React.useContext(pluginActionsContext)
@@ -35,7 +36,7 @@ export const SourceControlNavigation = ({ eventKey, activePanel, callback }) =>
 
         </span>
 
-        <SourceControlBase><SourceControlButtons/></SourceControlBase>
+        <SourceControlBase><SourceControlButtons panel={gitUIPanels.SOURCECONTROL}/></SourceControlBase>
 
       </div>
     </>
diff --git a/libs/remix-ui/git/src/components/panels/branches.tsx b/libs/remix-ui/git/src/components/panels/branches.tsx
index 789550589e..e0db3e4a4e 100644
--- a/libs/remix-ui/git/src/components/panels/branches.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches.tsx
@@ -1,46 +1,81 @@
 import React, { useEffect, useState } from "react";
-import { Alert } from "react-bootstrap";
 import { gitActionsContext } from "../../state/context";
-import { remote } from "../../types";
 import GitUIButton from "../buttons/gituibutton";
 import { gitPluginContext } from "../gitui";
 import { LocalBranchDetails } from "./branches/localbranchdetails";
 import { RemoteBranchDetails } from "./branches/remotebranchedetails";
 import { faSync } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { branch } from "@remix-api";
+
+const pageLength = 5;
 
 export const Branches = () => {
   const context = React.useContext(gitPluginContext)
   const actions = React.useContext(gitActionsContext)
+  const [localBranchPage, setLocalBranchPage] = useState(1);
+  const [remoteBranchPage, setRemoteBranchPage] = useState(1);
   const [newBranch, setNewBranch] = useState({ value: "" });
+  const [localBranches, setLocalBranches] = useState<branch[]>([]);
+  const [remoteBranches, setRemoteBranches] = useState<branch[]>([]);
+  const [currentBranch, setCurrentBranch] = useState<branch | null>(null);
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     setNewBranch({ value: e.currentTarget.value });
   };
 
+  useEffect(() => {
+    if (context.branches) {
+
+      if (context.currentBranch && context.currentBranch.name !== '') {
+        setCurrentBranch(context.branches.filter((branch, index) => !branch.remote && branch.name === context.currentBranch.name)[0]);
+        setLocalBranches(context.branches.filter((branch, index) => !branch.remote && branch.name !== context.currentBranch.name));
+      } else {
+        setLocalBranches(context.branches.filter((branch, index) => !branch.remote));
+      }
+      if (context.upstream) {
+        setRemoteBranches(context.branches.filter((branch, index) => branch.remote && branch.remote.name === context.upstream.name));
+      } else {
+        setRemoteBranches([]);
+      }
+    } else {
+      setLocalBranches([]);
+      setRemoteBranches([]);
+    }
+  }, [context.branches, context.defaultRemote, context.upstream, context.currentBranch]);
+
   return (
     <>
       <div data-id='branches-panel-content' className="pt-2">
         {context.branches && context.branches.length ?
           <div>
             <div data-id='branches-panel-content-local-branches'>
-              <label className="text-uppercase">local branches</label>
-              {context.branches && context.branches.filter((branch, index) => !branch.remote).map((branch, index) => {
+              <label className="text-uppercase">local branches </label><div className="badge badge-info badge-pill ml-2">{localBranches.length}</div>
+              {currentBranch && <LocalBranchDetails branch={currentBranch}></LocalBranchDetails>}
+              {context.branches && localBranches.slice(0, localBranchPage * pageLength).map((branch, index) => {
                 return (
                   <LocalBranchDetails key={index} branch={branch}></LocalBranchDetails>
                 );
               })}
+              {context.branches && localBranches.length > localBranchPage * pageLength && <GitUIButton className="btn btn-sm" onClick={() => {
+                setLocalBranchPage(localBranchPage + 1)
+              }}>Show more</GitUIButton>}
             </div>
             <hr />
             {context.upstream ?
               <>
                 <div data-id='branches-panel-content-remote-branches'>
-                  <label className="text-uppercase">remote branches on {context.upstream ? context.upstream.name : null}</label>
-                  {context.branches && context.branches.filter((branch, index) => branch.remote && branch.remote.name === context.upstream.name).map((branch, index) => {
-                    return (
-                      <RemoteBranchDetails allowCheckout={true} key={index} branch={branch}></RemoteBranchDetails>
-                    );
-                  })}
+                  <label className="text-uppercase">remote branches on {context.upstream ? context.upstream.name : null}</label><div className="badge badge-info badge-pill ml-2">{remoteBranches.length}</div>
+                  {context.branches && remoteBranches
+                    .slice(0, remoteBranchPage * pageLength)
+                    .map((branch, index) => {
+                      return (
+                        <RemoteBranchDetails allowCheckout={true} key={index} branch={branch}></RemoteBranchDetails>
+                      );
+                    })}
+                  {context.branches && remoteBranches.length > remoteBranchPage * pageLength && <><GitUIButton data-id='show-more-branches-on-remote' className="btn btn-sm" onClick={() => {
+                    setRemoteBranchPage(remoteBranchPage + 1);
+                  }}>Show more</GitUIButton><br></br></>}
                   <GitUIButton data-id={`remote-sync-${context.upstream.name}`} className="btn btn-sm" onClick={async () => {
                     await actions.fetch({
                       remote: context.upstream
diff --git a/libs/remix-ui/git/src/components/panels/branches/branchdifferencedetails.tsx b/libs/remix-ui/git/src/components/panels/branches/branchdifferencedetails.tsx
index c2090a87a5..b2a266c00a 100644
--- a/libs/remix-ui/git/src/components/panels/branches/branchdifferencedetails.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches/branchdifferencedetails.tsx
@@ -3,7 +3,7 @@ import { Accordion } from "react-bootstrap";
 import React, { useEffect, useState } from "react";
 import { CommitDetails } from "../commits/commitdetails";
 import { CommitsNavigation } from "../../navigation/commits";
-import { branch, remote } from "../../../types";
+import { branch, remote } from "@remix-api";
 import { gitActionsContext } from "../../../state/context";
 import { gitPluginContext } from "../../gitui";
 
diff --git a/libs/remix-ui/git/src/components/panels/branches/branchdifferences.tsx b/libs/remix-ui/git/src/components/panels/branches/branchdifferences.tsx
index 846d0230d1..86d4584724 100644
--- a/libs/remix-ui/git/src/components/panels/branches/branchdifferences.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches/branchdifferences.tsx
@@ -1,4 +1,4 @@
-import { branch, remote } from "../../../types";
+import { branch, remote } from "@remix-api";
 import React, { useEffect, useState } from "react";
 import { gitPluginContext } from "../../gitui";
 import { CommitDetails } from "../commits/commitdetails";
diff --git a/libs/remix-ui/git/src/components/panels/branches/localbranchdetails.tsx b/libs/remix-ui/git/src/components/panels/branches/localbranchdetails.tsx
index 2b996a3d34..dd9ab94358 100644
--- a/libs/remix-ui/git/src/components/panels/branches/localbranchdetails.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches/localbranchdetails.tsx
@@ -4,7 +4,8 @@ import { Accordion } from "react-bootstrap";
 import { CommitDetailsNavigation } from "../../navigation/commitdetails";
 import { gitActionsContext } from "../../../state/context";
 import { gitPluginContext } from "../../gitui";
-import { branch, gitMatomoEventTypes } from "../../../types";
+import { branch } from "@remix-api";
+import { gitMatomoEventTypes } from "../../../types";
 import { BrancheDetailsNavigation } from "../../navigation/branchedetails";
 import { CommitDetailsItems } from "../commits/commitdetailsitem";
 import { CommitDetails } from "../commits/commitdetails";
@@ -81,7 +82,7 @@ export const LocalBranchDetails = (props: BrancheDetailsProps) => {
             })}
           </div>
         </div>
-        {hasNextPage && <GitUIButton className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
+        {hasNextPage && <GitUIButton data-id='load-more-local-branches' className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
       </>
     </Accordion.Collapse>
   </Accordion>)
diff --git a/libs/remix-ui/git/src/components/panels/branches/remotebranchedetails.tsx b/libs/remix-ui/git/src/components/panels/branches/remotebranchedetails.tsx
index d80e999ee1..fcff0754a3 100644
--- a/libs/remix-ui/git/src/components/panels/branches/remotebranchedetails.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches/remotebranchedetails.tsx
@@ -4,7 +4,8 @@ import { Accordion } from "react-bootstrap";
 import { CommitDetailsNavigation } from "../../navigation/commitdetails";
 import { gitActionsContext } from "../../../state/context";
 import { gitPluginContext } from "../../gitui";
-import { branch, gitMatomoEventTypes } from "../../../types";
+import { branch } from "@remix-api";
+import { gitMatomoEventTypes } from "../../../types";
 import { BrancheDetailsNavigation } from "../../navigation/branchedetails";
 import { CommitDetailsItems } from "../commits/commitdetailsitem";
 import { CommitDetails } from "../commits/commitdetails";
@@ -59,7 +60,6 @@ export const RemoteBranchDetails = (props: BrancheDetailsProps) => {
     })
     await actions.checkout({
       ref: branch.name,
-      remote: branch.remote && branch.remote.name || null,
       refresh: true
     });
     await actions.getBranches()
@@ -107,7 +107,7 @@ export const RemoteBranchDetails = (props: BrancheDetailsProps) => {
           })}
 
         </div>
-        {hasNextPage && <GitUIButton className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
+        {hasNextPage && <GitUIButton data-id='load-more-remote-branches' className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
       </>
     </Accordion.Collapse>
   </Accordion>)
diff --git a/libs/remix-ui/git/src/components/panels/clone.tsx b/libs/remix-ui/git/src/components/panels/clone.tsx
index e7719fe68e..ab3ed7d6cb 100644
--- a/libs/remix-ui/git/src/components/panels/clone.tsx
+++ b/libs/remix-ui/git/src/components/panels/clone.tsx
@@ -78,7 +78,7 @@ export const Clone = (props: CloneProps) => {
           <FormControl data-id="clone-url" id="cloneulr" placeholder="url" name='cloneurl' value={cloneUrl} onChange={e => onGitHubCloneUrlChange(e.target.value)} aria-describedby="urlprepend" />
         </InputGroup>
 
-        <input name='clonebranch' onChange={e => onCloneBranchChange(e.target.value)} value={cloneBranch} className="form-control mb-2 mt-2" placeholder="branch" type="text" id="clonebranch" />
+        <input name='clonebranch' data-id="clone-branch" onChange={e => onCloneBranchChange(e.target.value)} value={cloneBranch} className="form-control mb-2 mt-2" placeholder="branch" type="text" id="clonebranch" />
         <GitUIButton disabledCondition={!cloneUrl} data-id='clone-btn' className='btn btn-primary mt-1 w-100' onClick={async () => {
           clone()
         }}>clone</GitUIButton>
diff --git a/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx b/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
index 981542f7cc..3fae193fd9 100644
--- a/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
+++ b/libs/remix-ui/git/src/components/panels/commands/pushpull.tsx
@@ -4,7 +4,8 @@ import { gitPluginContext } from "../../gitui";
 import { selectStyles, selectTheme } from "../../../types/styles";
 import Select, { Options, OptionsOrGroups } from 'react-select'
 import GitUIButton from "../../buttons/gituibutton";
-import { gitMatomoEventTypes, remote } from "../../../types";
+import { remote } from "@remix-api";
+import { gitMatomoEventTypes } from "../../../types";
 import { relative } from "path";
 import { sendToMatomo } from "../../../lib/pluginActions";
 
diff --git a/libs/remix-ui/git/src/components/panels/commits.tsx b/libs/remix-ui/git/src/components/panels/commits.tsx
index 8fa50a9d99..584c3f2fb4 100644
--- a/libs/remix-ui/git/src/components/panels/commits.tsx
+++ b/libs/remix-ui/git/src/components/panels/commits.tsx
@@ -1,12 +1,10 @@
-import { checkout, ReadCommitResult } from "isomorphic-git";
+import { ReadCommitResult } from "isomorphic-git";
 import React from "react";
 import { gitActionsContext } from "../../state/context";
 import GitUIButton from "../buttons/gituibutton";
 import { gitPluginContext } from "../gitui";
-import LoaderIndicator from "../navigation/loaderindicator";
 import { BranchDifferences } from "./branches/branchdifferences";
 import { CommitDetails } from "./commits/commitdetails";
-import { CommitSummary } from "./commits/commitsummary";
 
 export const Commits = () => {
   const [hasNextPage, setHasNextPage] = React.useState(true)
@@ -21,15 +19,16 @@ export const Commits = () => {
     }
   };
 
-  const loadNextPage = () => {
-    actions.fetch({
+  const loadNextPage = async () => {
+    await actions.fetch({
       remote: null,
       ref: context.currentBranch,
       relative: true,
       depth: 5,
-      singleBranch: true
+      singleBranch: true,
+      quiet: true
     })
-
+    await actions.setStateGitLogCount(context.gitLogCount + 5)
   }
 
   const getRemote = () => {
@@ -56,7 +55,7 @@ export const Commits = () => {
             })}
           </div>
         </div>
-        {hasNextPage && <GitUIButton disabledCondition={fetchIsDisabled()} className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
+        {hasNextPage && <GitUIButton data-id='load-more-commits' disabledCondition={fetchIsDisabled()} className="mb-1 ml-2 btn btn-sm" onClick={loadNextPage}>Load more</GitUIButton>}
         </>
         : <div className="text-muted">No commits</div>}
     </>
diff --git a/libs/remix-ui/git/src/components/panels/commits/commitdetailsitem.tsx b/libs/remix-ui/git/src/components/panels/commits/commitdetailsitem.tsx
index 3a02aefd87..cf7d80ed88 100644
--- a/libs/remix-ui/git/src/components/panels/commits/commitdetailsitem.tsx
+++ b/libs/remix-ui/git/src/components/panels/commits/commitdetailsitem.tsx
@@ -1,4 +1,4 @@
-import { branch, commitChange } from "../../../types";
+import { branch, commitChange } from "@remix-api";
 import React from "react";
 import path from "path";
 import { gitActionsContext, pluginActionsContext } from "../../../state/context";
diff --git a/libs/remix-ui/git/src/components/panels/commits/commitsummary.tsx b/libs/remix-ui/git/src/components/panels/commits/commitsummary.tsx
index bff01b4712..bd1e3a7dbd 100644
--- a/libs/remix-ui/git/src/components/panels/commits/commitsummary.tsx
+++ b/libs/remix-ui/git/src/components/panels/commits/commitsummary.tsx
@@ -61,7 +61,7 @@ export const CommitSummary = (props: CommitSummaryProps) => {
 
   return (
     <>
-      <div data-id={`commit-summary-${removeLineBreaks(commit.commit.message)}-${isAheadOfRepo ? 'ahead' : ''}`} className="long-and-truncated ml-2">
+      <div data-type='commit-summary' data-id={`commit-summary-${removeLineBreaks(commit.commit.message)}-${isAheadOfRepo ? 'ahead' : ''}`} className="long-and-truncated ml-2">
         {commit.commit.message}
       </div>
       {commit.commit.author.name || ""}
diff --git a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
index 3635fbe988..e466aeeaf9 100644
--- a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
+++ b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
@@ -22,7 +22,11 @@ export const GitHubCredentials = () => {
   useEffect(() => {
     refresh()
     if (context.gitHubUser) {
-      setScopeWarning(!(context.gitHubScopes && context.gitHubScopes.length > 0))
+      setScopeWarning(!(context.gitHubScopes
+        && context.gitHubScopes.includes('repo')
+        && context.gitHubScopes.includes('read:user')
+        && context.gitHubScopes.includes('user:email')
+        && context.gitHubScopes.includes('gist')))
     } else {
       setScopeWarning(false)
     }
@@ -92,7 +96,7 @@ export const GitHubCredentials = () => {
         </button>
       </div>
       {scopeWarning ?
-        <div className="text-warning">Your GitHub token may not have the correct permissions. Please use the login with GitHub feature.</div> : null}
+        <div className="text-warning">Your GitHub token may or may not have the correct permissions. Remix can't verify the permissions when using your own token. Please use the login with GitHub feature.</div> : null}
       <hr />
     </>
   );
diff --git a/libs/remix-ui/git/src/components/panels/init.tsx b/libs/remix-ui/git/src/components/panels/init.tsx
index 37969cfb0b..37996deddd 100644
--- a/libs/remix-ui/git/src/components/panels/init.tsx
+++ b/libs/remix-ui/git/src/components/panels/init.tsx
@@ -27,9 +27,6 @@ export const Init = () => {
           ><FormattedMessage id='git.init' /></GitUIButton>
         </div>
       </div>
-      <hr></hr>
-      <h5>CLONE</h5>
-      <Clone></Clone>
     </>
   )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/components/panels/remoteselect.tsx b/libs/remix-ui/git/src/components/panels/remoteselect.tsx
index 1bff2867b9..1111a84172 100644
--- a/libs/remix-ui/git/src/components/panels/remoteselect.tsx
+++ b/libs/remix-ui/git/src/components/panels/remoteselect.tsx
@@ -1,42 +1,63 @@
-import { branch, checkout, ReadCommitResult } from "isomorphic-git";
 import React, { useEffect, useState } from "react";
 import { gitActionsContext } from "../../state/context";
 import { gitPluginContext } from "../gitui";
 import { default as dateFormat } from "dateformat";
 import { RemotesDetailsNavigation } from "../navigation/remotesdetails";
 import { Accordion } from "react-bootstrap";
-import { remote } from "../../types";
+import { remote } from "@remix-api";
 import { RemoteBranchDetails } from "./branches/remotebranchedetails";
 import GitUIButton from "../buttons/gituibutton";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faSync } from "@fortawesome/free-solid-svg-icons";
+import { branch } from "@remix-api";
 
 export interface RemoteSelectProps {
   remote: remote
   openDefault: boolean
 }
 
+const pageLength = 5;
+
 export const Remoteselect = (props: RemoteSelectProps) => {
   const { remote, openDefault } = props;
   const context = React.useContext(gitPluginContext)
   const actions = React.useContext(gitActionsContext)
   const [activePanel, setActivePanel] = useState<string>("");
+  const [remoteBranchPage, setRemoteBranchPage] = useState(1);
+  const [remoteBranches, setRemoteBranches] = useState<branch[]>([]);
 
   useEffect(() => {
     setActivePanel(openDefault ? "0" : "")
   }, [openDefault])
 
+  useEffect(() => {
+    if (context.branches) {
+      if (remote && remote.name) {
+        setRemoteBranches(context.branches.filter((branch, index) => branch.remote && branch.remote.name === remote.name))
+      } else {
+        setRemoteBranches([]);
+      }
+    } else {
+      setRemoteBranches([]);
+    }
+  }, [context.branches, context.defaultRemote, context.upstream, remote]);
+
   return (
     <>
       <Accordion activeKey={activePanel} defaultActiveKey=''>
         <RemotesDetailsNavigation callback={setActivePanel} eventKey="0" activePanel={activePanel} remote={remote} />
         <Accordion.Collapse className="pl-2 border-left ml-1" eventKey="0">
           <>
-            {context.branches && context.branches.filter((branch, index) => branch.remote && branch.remote.name === remote.name).map((branch, index) => {
-              return (
-                <RemoteBranchDetails allowCheckout={false} key={index} branch={branch}></RemoteBranchDetails>
-              );
-            })}
+            {context.branches && remoteBranches
+              .slice(0, remoteBranchPage * pageLength)
+              .map((branch, index) => {
+                return (
+                  <RemoteBranchDetails allowCheckout={false} key={index} branch={branch}></RemoteBranchDetails>
+                );
+              })}
+            {context.branches && remoteBranches.length > remoteBranchPage * pageLength && <><GitUIButton className="btn btn-sm" onClick={() => {
+              setRemoteBranchPage(remoteBranchPage + 1);
+            }}>Show more</GitUIButton><br></br></>}
             <GitUIButton data-id={`remote-sync-${remote.name}`} className="btn btn-sm" onClick={async () => {
               await actions.fetch({
                 remote
diff --git a/libs/remix-ui/git/src/components/panels/remotesimport.tsx b/libs/remix-ui/git/src/components/panels/remotesimport.tsx
index 47c714f186..fc1a423de3 100644
--- a/libs/remix-ui/git/src/components/panels/remotesimport.tsx
+++ b/libs/remix-ui/git/src/components/panels/remotesimport.tsx
@@ -1,8 +1,8 @@
-import React, { useEffect, useState } from "react"
-import { Alert, Button } from "react-bootstrap"
-import { gitActionsContext } from "../../state/context"
-import { repository } from "../../types"
-import { gitPluginContext } from "../gitui"
+import React, { useEffect, useState } from "react";
+import { Alert, Button } from "react-bootstrap";
+import { gitActionsContext } from "../../state/context";
+import { repository } from "@remix-api";
+import { gitPluginContext } from "../gitui";
 import Select from 'react-select'
 import { selectStyles, selectTheme } from "../../types/styles"
 import { TokenWarning } from "./tokenWarning"
diff --git a/libs/remix-ui/git/src/components/panels/setup.tsx b/libs/remix-ui/git/src/components/panels/setup.tsx
index 71b35f1499..184a46eadf 100644
--- a/libs/remix-ui/git/src/components/panels/setup.tsx
+++ b/libs/remix-ui/git/src/components/panels/setup.tsx
@@ -1,39 +1,28 @@
 import React, { useEffect, useState } from 'react'
-import { GetDeviceCode } from '../github/devicecode'
-import { GitHubCredentials } from './githubcredentials'
-import { Clone } from './clone'
+import { gitUIPanels } from '../../types'
+import GitUIButton from '../buttons/gituibutton'
+import { FormattedMessage } from 'react-intl'
 
-export const Setup = () => {
+export const Setup = ({ callback }) => {
 
-  const [screen, setScreen] = useState(0)
+  const startSetingUp = () => {
+    callback(gitUIPanels.GITHUB)
+  }
 
-  if (screen === 0) {
-    return (
-      <>
-        <h5>SETUP</h5>
-        <div>
-          <div className='mt-1 mb-2'>
-          To ensure that your commits are properly attributed in Git, you need to configure a username and email address.
-          These will be used to identify the author of the commit.
-          </div>
-          <GetDeviceCode></GetDeviceCode>
-          <hr></hr>
-          <GitHubCredentials></GitHubCredentials>
-        </div>
-        <h5>CLONE</h5>
-        <Clone hideLoadFromGitHub={true}></Clone>
-      </>
-    )
-  } else if (screen === 1) {
-    return (
-      <>
-        <h5>SETUP</h5>
-        <h6>Step 2</h6>
-        <div>
-          To ensure that your commits are properly attributed in Git, you need to configure your username and email address.
-          <GitHubCredentials></GitHubCredentials>
+  return (
+    <>
+      <h5>SETUP REQUIRED</h5>
+      <div>
+        <div className='mt-1 mb-2'>
+          To ensure that your commits are properly attributed in Git, you need to <a href='#' onClick={startSetingUp} className='cursor-pointer mr-1'>configure a username and email address or connect to GitHub.</a>
+          These credentials will be used to identify the author of the commit.
+
+          <a href='#' onClick={startSetingUp} className='ml-1 cursor-pointer'>
+            <FormattedMessage id='git.setup' /></a>
         </div>
-      </>
-    )
-  }
+        <hr></hr>
+      </div>
+    </>
+  )
+
 }
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcecontrolitem.tsx b/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcecontrolitem.tsx
index a28d2a6664..0a96f7b728 100644
--- a/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcecontrolitem.tsx
+++ b/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcecontrolitem.tsx
@@ -1,4 +1,4 @@
-import { commitChange, fileStatusResult, sourceControlGroup } from "../../../types";
+import { fileStatusResult, sourceControlGroup } from "../../../types";
 import React from "react";
 import path from "path";
 import { gitActionsContext, pluginActionsContext } from "../../../state/context";
@@ -6,6 +6,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faGlobe } from "@fortawesome/free-solid-svg-icons";
 import { SourceControlItemButtons } from "./sourcontrolitembuttons";
 import { removeSlash } from "../../../utils";
+import { commitChange } from "@remix-api";
 
 export interface SourceControlItemProps {
   file: fileStatusResult;
diff --git a/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcontrolitembuttons.tsx b/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcontrolitembuttons.tsx
index d1ba05ef1f..572180329c 100644
--- a/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcontrolitembuttons.tsx
+++ b/libs/remix-ui/git/src/components/panels/sourcecontrol/sourcontrolitembuttons.tsx
@@ -1,4 +1,4 @@
-import { commitChange, fileStatusResult, sourceControlGroup } from "../../../types";
+import { fileStatusResult, sourceControlGroup } from "../../../types";
 import React from "react";
 import path from "path";
 import { gitActionsContext, pluginActionsContext } from "../../../state/context";
diff --git a/libs/remix-ui/git/src/components/panels/version.tsx b/libs/remix-ui/git/src/components/panels/version.tsx
new file mode 100644
index 0000000000..ccfef84ac9
--- /dev/null
+++ b/libs/remix-ui/git/src/components/panels/version.tsx
@@ -0,0 +1,10 @@
+import React, { useEffect, useState } from 'react'
+import { gitPluginContext } from '../gitui'
+export const Version = () => {
+  const context = React.useContext(gitPluginContext)
+  return (
+    <div>
+      <p>{context.version.includes('version') ? context.version : `Git version: ${context.version}` }</p>
+    </div>
+  )
+}
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/index.ts b/libs/remix-ui/git/src/index.ts
index 677c174059..57959fe7e1 100644
--- a/libs/remix-ui/git/src/index.ts
+++ b/libs/remix-ui/git/src/index.ts
@@ -1,4 +1,4 @@
 export * from './types'
 export { GitUI } from './components/gitui'
-export { commitChange, commitChangeType, remote, branch } from './types'
+export { commitChange, commitChangeType, remote, branch } from '@remix-api'
 export * from './types/styles'
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/lib/gitactions.ts b/libs/remix-ui/git/src/lib/gitactions.ts
index 1805289dfc..f7e549de2c 100644
--- a/libs/remix-ui/git/src/lib/gitactions.ts
+++ b/libs/remix-ui/git/src/lib/gitactions.ts
@@ -1,13 +1,13 @@
 import { ReadBlobResult, ReadCommitResult } from "isomorphic-git";
 import React from "react";
-import { fileStatus, fileStatusMerge, setRemoteBranchCommits, resetRemoteBranchCommits, setBranches, setCanCommit, setCommitChanges, setCommits, setCurrentBranch, setGitHubUser, setLoading, setRemoteBranches, setRemotes, setRepos, setUpstream, setLocalBranchCommits, setBranchDifferences, setRemoteAsDefault, setScopes, setLog, clearLog, setUserEmails, setCurrenHead, setStoragePayload, resetBranchDifferences } from "../state/gitpayload";
-import { GitHubUser, branch, commitChange, gitActionDispatch, statusMatrixType, gitState, branchDifference, remote, gitLog, fileStatusResult, customGitApi, IGitApi, cloneInputType, fetchInputType, pullInputType, pushInputType, checkoutInput, rmInput, addInput, repository, userEmails, storage, gitMatomoEventTypes } from '../types';
+import { fileStatus, fileStatusMerge, setRemoteBranchCommits, resetRemoteBranchCommits, setBranches, setCanCommit, setCommitChanges, setCommits, setCurrentBranch, setGitHubUser, setLoading, setRemoteBranches, setRemotes, setRepos, setUpstream, setLocalBranchCommits, setBranchDifferences, setRemoteAsDefault, setScopes, setLog, clearLog, setUserEmails, setCurrenHead, setStoragePayload, resetBranchDifferences, setTimestamp, setGitLogCount } from "../state/gitpayload";
+import { gitActionDispatch, statusMatrixType, gitState, gitLog, fileStatusResult, storage, gitMatomoEventTypes } from '../types';
 import { removeSlash } from "../utils";
 import { disableCallBacks, enableCallBacks } from "./listeners";
-import { ModalTypes } from "@remix-ui/app";
+import { ModalTypes, appActionTypes, AppAction } from "@remix-ui/app";
 import { sendToMatomo, setFileDecorators } from "./pluginActions";
 import { Plugin } from "@remixproject/engine";
-import { CustomRemixApi } from "@remix-api";
+import { addInputType, branch, branchDifference, checkoutInputType, cloneInputType, commitChange, CustomRemixApi, fetchInputType, GitHubUser, pullInputType, pushInputType, remote, rmInputType, userEmails } from "@remix-api";
 
 export const fileStatuses = [
   ["new,untracked", 0, 2, 0], // new, untracked
@@ -20,7 +20,7 @@ export const fileStatuses = [
   ["deleted,unstaged", 1, 0, 1], // deleted, unstaged
   ["deleted,staged", 1, 0, 0],
   ["unmodified", 1, 1, 3],
-  ["deleted,not in git", 0, 0, 3],
+  ["added,deleted", 0, 0, 3],
   ["unstaged,modified", 1, 2, 0]
 ];
 
@@ -31,29 +31,31 @@ const statusmatrix: statusMatrixType[] = fileStatuses.map((x: any) => {
   };
 });
 
-let plugin: Plugin<any, CustomRemixApi>, dispatch: React.Dispatch<gitActionDispatch>
+let plugin: Plugin<any, CustomRemixApi>, dispatch: React.Dispatch<gitActionDispatch>, appDispatcher: React.Dispatch<AppAction>
 
-export const setPlugin = (p: Plugin, dispatcher: React.Dispatch<gitActionDispatch>) => {
+export const setPlugin = (p: Plugin, dispatcher: React.Dispatch<gitActionDispatch>, appDispatch: React.Dispatch<AppAction>) => {
   plugin = p
   dispatch = dispatcher
+  appDispatcher = appDispatch
 }
 
 export const init = async () => {
   await sendToMatomo(gitMatomoEventTypes.INIT)
   await plugin.call('dgitApi', "init");
-  await gitlog();
+  dispatch(setTimestamp(Date.now()))
   await getBranches();
 }
 
 export const getBranches = async () => {
 
-  const branches = await plugin.call('dgitApi', "branches")
+  const branches = await plugin.call('dgitApi', 'branches')
 
   dispatch(setBranches(branches));
+  await showCurrentBranch();
 }
 export const getRemotes = async () => {
 
-  const remotes: remote[] = await plugin.call('dgitApi', "remotes");
+  const remotes: remote[] = await plugin.call('dgitApi', 'remotes');
 
   dispatch(setRemotes(remotes));
 }
@@ -63,6 +65,7 @@ export const setUpstreamRemote = async (remote: remote) => {
 }
 
 export const getFileStatusMatrix = async (filepaths: string[]) => {
+
   dispatch(setLoading(true))
   const fileStatusResult = await statusMatrix(filepaths);
   fileStatusResult.map((m) => {
@@ -78,16 +81,17 @@ export const getFileStatusMatrix = async (filepaths: string[]) => {
     dispatch(fileStatusMerge(fileStatusResult))
     setFileDecorators(fileStatusResult)
   }
+
   dispatch(setLoading(false))
 }
 
-export const getCommits = async () => {
+export const getCommits = async (depth: number) => {
 
   try {
     const commits: ReadCommitResult[] = await plugin.call(
       'dgitApi',
       "log",
-      { ref: "HEAD" }
+      { ref: "HEAD", depth: depth }
     );
 
     return commits;
@@ -96,16 +100,21 @@ export const getCommits = async () => {
   }
 }
 
-export const gitlog = async () => {
+export const gitlog = async (depth: number) => {
   dispatch(setLoading(true))
   let commits = []
   try {
-    commits = await getCommits()
+    commits = await getCommits(depth)
   } catch (e) {
   }
   dispatch(setCommits(commits))
   await showCurrentBranch()
   dispatch(setLoading(false))
+
+}
+
+export const setStateGitLogCount = async (count: number) => {
+  dispatch(setGitLogCount(count))
 }
 
 export const showCurrentBranch = async () => {
@@ -228,7 +237,7 @@ export const addall = async (files: fileStatusResult[]) => {
   }
 }
 
-export const add = async (filepath: addInput) => {
+export const add = async (filepath: addInputType) => {
   await sendToMatomo(gitMatomoEventTypes.ADD)
   try {
     if (typeof filepath.filepath === "string") {
@@ -255,7 +264,7 @@ const getLastCommmit = async () => {
   }
 }
 
-export const rm = async (args: rmInput) => {
+export const rm = async (args: rmInputType) => {
   await sendToMatomo(gitMatomoEventTypes.RM)
   await plugin.call('dgitApi', 'rm', {
     filepath: removeSlash(args.filepath),
@@ -292,7 +301,7 @@ export const checkoutfile = async (filename: string) => {
     }
 }
 
-export const checkout = async (cmd: checkoutInput) => {
+export const checkout = async (cmd: checkoutInputType) => {
   sendToMatomo(gitMatomoEventTypes.CHECKOUT)
   await disableCallBacks();
   await plugin.call('fileManager', 'closeAllFiles')
@@ -342,7 +351,7 @@ export const fetch = async (input: fetchInputType) => {
   try {
     await plugin.call('dgitApi', 'fetch', input);
     if (!input.quiet) {
-      await gitlog()
+      dispatch(setTimestamp(Date.now()))
       await getBranches()
     }
   } catch (e: any) {
@@ -359,7 +368,7 @@ export const pull = async (input: pullInputType) => {
   await disableCallBacks()
   try {
     await plugin.call('dgitApi', 'pull', input)
-    await gitlog()
+    dispatch(setTimestamp(Date.now()))
   } catch (e: any) {
     console.log(e)
     await parseError(e)
@@ -393,6 +402,8 @@ const tokenWarning = async () => {
 
 const parseError = async (e: any) => {
   console.trace(e)
+  if (!e.message) return
+
   // if message conttains 401 Unauthorized, show token warning
   if (e.message.includes('401')) {
     await sendToMatomo(gitMatomoEventTypes.ERROR, ['401'])
@@ -522,6 +533,7 @@ export const remoteBranches = async (owner: string, repo: string) => {
 }
 
 export const remoteCommits = async (url: string, branch: string, length: number) => {
+
   const urlParts = url.split("/");
 
   // check if it's github
@@ -571,7 +583,9 @@ export const saveGitHubCredentials = async (credentials: { username: string, ema
       }
       dispatch(setGitHubUser({
         login: credentials.username,
+        isConnected: false
       }))
+      appDispatcher({ type: appActionTypes.setGitHubUser, payload: { login: credentials.username, isConnected: false } })
       dispatch(setUserEmails([{
         email: credentials.email,
         primary: true,
@@ -631,6 +645,7 @@ export const loadGitHubUserFromToken = async () => {
         if (data.user && data.user.login && (storedUsername !== data.user.login)) await plugin.call('config', 'setAppParameter', 'settings/github-user-name', data.user.login)
 
         dispatch(setGitHubUser(data.user))
+        appDispatcher({ type: appActionTypes.setGitHubUser, payload: data.user })
         dispatch(setScopes(data.scopes))
         dispatch(setUserEmails(data.emails))
         sendToGitLog({
@@ -646,6 +661,7 @@ export const loadGitHubUserFromToken = async () => {
           message: `Please check your GitHub token in the GitHub settings.`
         })
         dispatch(setGitHubUser(null))
+        appDispatcher({ type: appActionTypes.setGitHubUser, payload: null })
         return false
       }
     } else {
@@ -654,6 +670,7 @@ export const loadGitHubUserFromToken = async () => {
         message: `Please check your GitHub token in the GitHub settings.`
       })
       dispatch(setGitHubUser(null))
+      appDispatcher({ type: appActionTypes.setGitHubUser, payload: null })
       return false
     }
   } catch (e) {
@@ -663,7 +680,9 @@ export const loadGitHubUserFromToken = async () => {
 }
 
 export const statusMatrix = async (filepaths: string[]) => {
+
   const matrix = await plugin.call('dgitApi', 'status', { ref: "HEAD", filepaths: filepaths || ['.']});
+
   const result = (matrix || []).map((x) => {
     return {
       filename: `/${x.shift()}`,
@@ -726,6 +745,7 @@ export const diff = async (commitChange: commitChange) => {
 }
 
 export const getCommitChanges = async (oid1: string, oid2: string, branch?: branch, remote?: remote) => {
+
   try {
     let log
     try {
@@ -738,6 +758,7 @@ export const getCommitChanges = async (oid1: string, oid2: string, branch?: bran
       console.log(e, 'log error')
     }
     if (log) {
+
       const foundCommit = log.find((commit: ReadCommitResult) => commit.oid === oid2)
       if (!foundCommit && remote) {
 
@@ -774,6 +795,7 @@ async function getRepoDetails(url: string) {
 }
 
 export const fetchBranch = async (branch: branch, page: number) => {
+
   if (!branch.remote || !branch.remote.url) return
   const token = await tokenWarning();
   if (page == 1) {
@@ -793,6 +815,7 @@ export const fetchBranch = async (branch: branch, page: number) => {
 }
 
 export const getBranchDifferences = async (branch: branch, remote: remote, state: gitState) => {
+
   if (!remote && state) {
     if (state.defaultRemote) {
       remote = state.defaultRemote
diff --git a/libs/remix-ui/git/src/lib/listeners.ts b/libs/remix-ui/git/src/lib/listeners.ts
index a873b303f7..42f450c058 100644
--- a/libs/remix-ui/git/src/lib/listeners.ts
+++ b/libs/remix-ui/git/src/lib/listeners.ts
@@ -1,12 +1,14 @@
 
 import React from "react";
-import { setCanUseApp, setLoading, setRepoName, setGItHubToken, setLog, setGitHubUser, setUserEmails } from "../state/gitpayload";
+import { setCanUseApp, setLoading, setRepoName, setGItHubToken, setLog, setGitHubUser, setUserEmails, setTimestamp, setDesktopWorkingDir, setVersion } from "../state/gitpayload";
 import { gitActionDispatch, gitUIPanels, storage } from "../types";
 import { Plugin } from "@remixproject/engine";
 import { getBranches, getFileStatusMatrix, loadGitHubUserFromToken, getRemotes, gitlog, setPlugin, setStorage } from "./gitactions";
 import { Profile } from "@remixproject/plugin-utils";
 import { CustomRemixApi } from "@remix-api";
 import { statusChanged } from "./pluginActions";
+import { appPlatformTypes } from "@remix-ui/app";
+import { AppAction } from "@remix-ui/app";
 
 let plugin: Plugin<any, CustomRemixApi>, gitDispatch: React.Dispatch<gitActionDispatch>, loaderDispatch: React.Dispatch<any>, loadFileQueue: AsyncDebouncedQueue
 let callBackEnabled: boolean = false
@@ -34,13 +36,13 @@ class AsyncDebouncedQueue {
   }
 }
 
-export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<gitActionDispatch>, loaderDispatcher: React.Dispatch<any>, setAtivePanel: React.Dispatch<React.SetStateAction<string>>) => {
+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) => {
   plugin = viewPlugin
   gitDispatch = gitDispatcher
   loaderDispatch = loaderDispatcher
   loadFileQueue = new AsyncDebouncedQueue()
 
-  setPlugin(viewPlugin, gitDispatcher)
+  setPlugin(viewPlugin, gitDispatcher, appDispatcher)
 
   plugin.on("fileManager", "fileSaved", async (file: string) => {
     loadFileQueue.enqueue(async () => {
@@ -66,13 +68,44 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
     })
   });
 
+  plugin.on('fs', 'workingDirChanged', async (path: string) => {
+
+    gitDispatcher(setDesktopWorkingDir(path))
+    gitDispatch(setCanUseApp(path ? true : false))
+    const version = await plugin.call('dgitApi', 'version')
+
+    gitDispatch(setVersion(version))
+    loadFileQueue.enqueue(async () => {
+      loadFiles()
+    })
+    loadFileQueue.enqueue(async () => {
+      gitDispatch(setTimestamp(Date.now()))
+    })
+    loadFileQueue.enqueue(async () => {
+      getBranches()
+    })
+    loadFileQueue.enqueue(async () => {
+      getRemotes()
+    })
+  })
+
   plugin.on("filePanel", "setWorkspace", async (x: any) => {
-    gitDispatch(setCanUseApp(x && !x.isLocalhost && x.name))
+
+    if (platform == appPlatformTypes.desktop) {
+      const workingDir = await plugin.call('fs', 'getWorkingDir')
+      gitDispatch(setCanUseApp(workingDir? true : false))
+      const version = await plugin.call('dgitApi', 'version')
+
+      gitDispatch(setVersion(version))
+    } else {
+      gitDispatch(setCanUseApp(x && !x.isLocalhost && x.name))
+    }
+
     loadFileQueue.enqueue(async () => {
       loadFiles()
     })
     loadFileQueue.enqueue(async () => {
-      gitlog()
+      gitDispatch(setTimestamp(Date.now()))
     })
     loadFileQueue.enqueue(async () => {
       getBranches()
@@ -84,7 +117,7 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
 
   plugin.on('dgitApi', 'checkout', async () => {
     loadFileQueue.enqueue(async () => {
-      gitlog()
+      gitDispatch(setTimestamp(Date.now()))
     })
     loadFileQueue.enqueue(async () => {
       getBranches()
@@ -110,8 +143,12 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
     }, 10)
   })
   plugin.on('dgitApi', 'commit', async () => {
+
+    loadFileQueue.enqueue(async () => {
+      loadFiles()
+    }, 10)
     loadFileQueue.enqueue(async () => {
-      gitlog()
+      gitDispatch(setTimestamp(Date.now()))
     }, 10)
     loadFileQueue.enqueue(async () => {
       getBranches()
@@ -123,7 +160,7 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
   })
   plugin.on('dgitApi', 'branch', async () => {
     loadFileQueue.enqueue(async () => {
-      gitlog()
+      gitDispatch(setTimestamp(Date.now()))
     })
     loadFileQueue.enqueue(async () => {
       getBranches()
@@ -145,7 +182,7 @@ export const setCallBacks = (viewPlugin: Plugin, gitDispatcher: React.Dispatch<g
       getBranches()
     })
     loadFileQueue.enqueue(async () => {
-      gitlog()
+      gitDispatch(setTimestamp(Date.now()))
     })
   })
   plugin.on('manager', 'pluginActivated', async (p: Profile<any>) => {
diff --git a/libs/remix-ui/git/src/lib/pluginActions.ts b/libs/remix-ui/git/src/lib/pluginActions.ts
index 7d9e81ee7a..d1c7a8854a 100644
--- a/libs/remix-ui/git/src/lib/pluginActions.ts
+++ b/libs/remix-ui/git/src/lib/pluginActions.ts
@@ -1,9 +1,10 @@
 
-import { commitChange, fileStatusResult, gitActionDispatch, gitMatomoEventTypes, gitState } from "../types"
+import { fileStatusResult, gitActionDispatch, gitState } from "../types"
+import { gitMatomoEventTypes } from "../types"
 import { fileDecoration, fileDecorationType } from "@remix-ui/file-decorators"
 import { removeSlash } from "../utils"
 import { getFilesByStatus } from "./fileHelpers"
-import { CustomRemixApi } from "@remix-api";
+import { commitChange, CustomRemixApi } from "@remix-api";
 import { Plugin } from "@remixproject/engine";
 
 let plugin: Plugin<any, CustomRemixApi>, gitDispatch: React.Dispatch<gitActionDispatch>, loaderDispatch: React.Dispatch<any>
@@ -98,6 +99,13 @@ export const clearFileDecorator = async(path: string) => {
   await plugin.call('fileDecorator', 'clearFileDecorators', path)
 }
 
+export const openFolderInSameWindow = async (path: string) => {
+  await plugin.call('fs', 'openFolderInSameWindow', path)
+}
+
+export const openCloneDialog = async () => {
+  plugin.call('filePanel', 'clone')
+}
 export const sendToMatomo = async (event: gitMatomoEventTypes, args?: string[]) => {
   const trackArgs = args ? ['trackEvent', 'git', event, ...args] : ['trackEvent', 'git', event];
   plugin && await plugin.call('matomo', 'track', trackArgs);
diff --git a/libs/remix-ui/git/src/state/actions.ts b/libs/remix-ui/git/src/state/actions.ts
index 6aa8b95bff..4cd9de59e0 100644
--- a/libs/remix-ui/git/src/state/actions.ts
+++ b/libs/remix-ui/git/src/state/actions.ts
@@ -1,5 +1,7 @@
 import { ReadCommitResult } from "isomorphic-git"
-import { branch, branchDifference, commitChange, fileStatusResult, GitHubUser, gitLog, pagedCommits, remote, remoteBranch, repository, storage, userEmails } from "../types"
+import { fileStatusResult, gitLog } from "../types"
+import { GitHubUser, branch, branchDifference, commitChange, pagedCommits, remote, remoteBranch, repository, userEmails } from '@remix-api'
+import { storage } from "../types"
 
 export interface ActionPayloadTypes {
   FILE_STATUS: fileStatusResult[],
@@ -43,7 +45,11 @@ export interface ActionPayloadTypes {
   SET_LOG: gitLog
   CLEAR_LOG: void
   SET_USER_EMAILS: userEmails
+  DESKTOP_SET_WORKING_DIR: string
+  SET_VERSION: string
   SET_STORAGE: storage
+  SET_TIMESTAMP: number
+  SET_GIT_LOG_COUNT: number
 }
 
 export interface Action<T extends keyof ActionPayloadTypes> {
diff --git a/libs/remix-ui/git/src/state/context.tsx b/libs/remix-ui/git/src/state/context.tsx
index 4608406a7f..ff59a40d91 100644
--- a/libs/remix-ui/git/src/state/context.tsx
+++ b/libs/remix-ui/git/src/state/context.tsx
@@ -1,12 +1,13 @@
+import { branch, addInputType, checkoutInputType, cloneInputType, commitChange, fetchInputType, pullInputType, pushInputType, remote, rmInputType } from "@remix-api"
 import { ReadCommitResult } from "isomorphic-git"
 import React from "react"
-import { addInput, branch, checkoutInput, cloneInputType, commitChange, fetchInputType, fileStatusResult, gitLog, gitState, pullInputType, pushInputType, remote, rmInput } from "../types"
+import { fileStatusResult, gitLog, gitState } from "../types"
 
 export interface gitActions {
     removeRemote(remote: remote): void
     clone(input: cloneInputType): Promise<void>
-    add(input: addInput): Promise<void>
-    rm(input: rmInput): Promise<void>
+    add(input: addInputType): Promise<void>
+    rm(input: rmInputType): Promise<void>
     commit(message: string): Promise<any>
     addall(files: fileStatusResult[]): Promise<void>
     push(input: pushInputType): Promise<void>
@@ -14,7 +15,7 @@ export interface gitActions {
     fetch(input: fetchInputType): Promise<void>
     repositories(): Promise<any>
     checkoutfile(file: string): Promise<void>
-    checkout(input: checkoutInput): Promise<void>
+    checkout(input: checkoutInputType): Promise<void>
     createBranch(branch: string): Promise<void>
     remoteBranches(owner: string, repo: string): Promise<any>
     getCommitChanges(oid1: string, oid2: string, branch?: branch, remote?: remote): Promise<commitChange[] | boolean>
@@ -31,8 +32,9 @@ export interface gitActions {
     sendToGitLog: (message: gitLog) => Promise<void>
     clearGitLog: () => Promise<void>
     getFileStatusMatrix(filespaths:[]): Promise<void>
-    gitlog(): Promise<void>
+    gitlog(depth: number): Promise<void>
     init(): Promise<void>
+    setStateGitLogCount(count: number): Promise<void>
 }
 
 export const gitActionsContext = React.createContext<gitActions>(null)
@@ -54,6 +56,7 @@ export interface pluginActions {
         token: string
     }>
     showAlert({ title, message }:{title: string, message: string}): Promise<void>
+    openFolderInSameWindow(path: string): Promise<void>
 }
 
 export const pluginActionsContext = React.createContext<pluginActions>(null)
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/state/gitpayload.ts b/libs/remix-ui/git/src/state/gitpayload.ts
index 1c93a40a90..36fc1f837d 100644
--- a/libs/remix-ui/git/src/state/gitpayload.ts
+++ b/libs/remix-ui/git/src/state/gitpayload.ts
@@ -1,5 +1,7 @@
 import { ReadCommitResult } from "isomorphic-git"
-import { GitHubUser, branch, commitChange, fileStatusResult, remote, pagedCommits, branchDifference, gitLog, repository, userEmails, storage } from "../types"
+import { fileStatusResult, gitLog } from "../types"
+import { repository, pagedCommits, branch, remote, commitChange, branchDifference, GitHubUser, userEmails } from "@remix-api"
+import { storage } from "../types"
 import { Endpoints } from "@octokit/types"
 
 export const fileStatus = (files: fileStatusResult[]) => {
@@ -225,9 +227,36 @@ export const clearLog = () => {
   }
 }
 
+export const setDesktopWorkingDir = (dir: string) => {
+  return {
+    type: 'DESKTOP_SET_WORKING_DIR',
+    payload: dir
+  }
+}
+
+export const setVersion = (version: string) => {
+  return {
+    type: 'SET_VERSION',
+    payload: version
+  }
+}
 export const setStoragePayload = (storage: storage) => {
   return {
     type: 'SET_STORAGE',
     payload: storage
   }
 }
+
+export const setTimestamp = (timestamp: number) => {
+  return {
+    type: 'SET_TIMESTAMP',
+    payload: timestamp
+  }
+}
+
+export const setGitLogCount = (count: number) => {
+  return {
+    type: 'SET_GIT_LOG_COUNT',
+    payload: count
+  }
+}
diff --git a/libs/remix-ui/git/src/state/gitreducer.tsx b/libs/remix-ui/git/src/state/gitreducer.tsx
index 592360a94a..65ab5e57a8 100644
--- a/libs/remix-ui/git/src/state/gitreducer.tsx
+++ b/libs/remix-ui/git/src/state/gitreducer.tsx
@@ -1,6 +1,6 @@
-import { ReadCommitResult } from "isomorphic-git"
-import { allChangedButNotStagedFiles, getFilesByStatus, getFilesWithNotModifiedStatus } from "../lib/fileHelpers"
-import { branch, commitChange, defaultGitState, fileStatusResult, gitState, setRemoteBranchCommitsAction, setLocalBranchCommitsAction, setBranchDifferencesAction, setDefaultRemoteAction, setRemotesAction, setUpstreamAction } from "../types"
+import { commitChange } from "@remix-api"
+import { allChangedButNotStagedFiles, getFilesByStatus } from "../lib/fileHelpers"
+import { defaultGitState, fileStatusResult, gitState } from "../types"
 import { Actions } from "./actions"
 
 export const gitReducer = (state: gitState = defaultGitState, action: Actions): gitState => {
@@ -210,11 +210,33 @@ export const gitReducer = (state: gitState = defaultGitState, action: Actions):
       log: []
     }
 
+  case 'DESKTOP_SET_WORKING_DIR':
+    return {
+      ...state,
+      desktopWorkingDir: action.payload
+    }
+
+  case 'SET_VERSION':
+    return {
+      ...state,
+      version: action.payload
+    }
   case 'SET_STORAGE':
     return {
       ...state,
       storage: action.payload
     }
+  case 'SET_TIMESTAMP':
+    return {
+      ...state,
+      timestamp: action.payload
+    }
 
+  case 'SET_GIT_LOG_COUNT':
+    return {
+      ...state,
+      gitLogCount: action.payload
+    }
   }
+
 }
diff --git a/libs/remix-ui/git/src/types/index.ts b/libs/remix-ui/git/src/types/index.ts
index 31e34db978..f87ee222f8 100644
--- a/libs/remix-ui/git/src/types/index.ts
+++ b/libs/remix-ui/git/src/types/index.ts
@@ -1,155 +1,12 @@
 import { Endpoints } from "@octokit/types"
-import { IRemixApi } from "@remixproject/plugin-api"
-import { LibraryProfile, StatusEvents } from "@remixproject/plugin-utils"
-import { CommitObject, ReadBlobResult, ReadCommitResult, StatusRow } from "isomorphic-git"
-export type GitHubUser = Partial<Endpoints["GET /user"]["response"]['data']>
-export type userEmails = Endpoints["GET /user/emails"]["response"]["data"]
-
-export interface IGitApi {
-    events: {
-        "checkout": () => void
-        "clone": () => void
-        "add": () => void
-        "rm": () => void
-        "commit": () => void
-        "branch": () => void
-        "init": () => void
-    } & StatusEvents,
-    methods: {
-        getCommitChanges(oid1: string, oid2: string): Promise<commitChange[]>
-        repositories(input: repositoriesInput): Promise<repository[]>
-        clone(input: cloneInputType): Promise<any>
-        branches(input?: branchesInput): Promise<branch[]>,
-        remotes(): Promise<remote[]>,
-        log(cmd: { ref: string }): Promise<ReadCommitResult[]>,
-        remotecommits(input: remoteCommitsInputType): Promise<pagedCommits[]>
-        fetch(input: fetchInputType): Promise<any>
-        pull(input: pullInputType): Promise<any>
-        push(input: pushInputType): Promise<any>
-        currentbranch(input?: currentBranchInput): Promise<branch>
-        branch(input: branchInputType): Promise<void>
-        checkout(input: checkoutInput): Promise<void>
-        add(input: addInput): Promise<void>
-        rm(input: rmInput): Promise<void>
-        resolveref(input: resolveRefInput): Promise<string>
-        readblob(input: readBlobInput): Promise<ReadBlobResult>
-        commit(input: commitInput): Promise<string>
-        addremote(input: remote): Promise<void>
-        delremote(input: remote): Promise<void>
-        status(input?: statusInput): Promise<Array<StatusRow>>
-        compareBranches(input: compareBranchesInput): Promise<branchDifference>
-        init(input?: initInput): Promise<void>
-        updateSubmodules: (input: updateSubmodulesInput) => Promise<void>
-    }
-}
-
-export type initInput = {
-    defaultBranch: string
-}
-
-export type updateSubmodulesInput = {
-    dir?: string
-    token?: string
-}
-
-export type remoteCommitsInputType = {
-    owner: string, repo: string, token: string, branch: string, length: number, page: number
-}
-
-export type compareBranchesInput = {
-    branch: branch, remote: remote
-}
-
-export type fetchInputType = {
-    remote: remote,
-    ref?: branch,
-    remoteRef?: branch,
-    depth?: number,
-    singleBranch?: boolean,
-    relative?: boolean,
-    quiet?: boolean
-}
-
-export type pullInputType = {
-    remote: remote, ref: branch, remoteRef?: branch
-}
-
-export type pushInputType = {
-    remote: remote, ref: branch, remoteRef?: branch, force?: boolean
-}
-
-export type branchInputType = {
-    ref: string,
-    checkout?: boolean
-    refresh?: boolean
-    force?: boolean
-}
-
-export type currentBranchInput = {
-    fs: any,
-    dir: string
-}
-
-export type checkoutInput = {
-    ref: string,
-    force?: boolean,
-    remote?: string
-    refresh?: boolean
-    fetch?: boolean
-}
-
-export type addInput = {
-    filepath: string | string[]
-}
-
-export type rmInput = {
-    filepath: string
-}
-
-export type resolveRefInput = {
-    ref: string
-}
-
-export type readBlobInput = {
-    oid: string,
-    filepath: string
-}
-
-export type commitInput = {
-    author: {
-        name: string,
-        email: string,
-    },
-    message: string,
-}
-
-export type branchesInput = {
-    fs?: any
-    dir?: string
-}
-
-export interface cloneInputType {
-    url: string,
-    branch?: string,
-    depth?: number,
-    singleBranch?: boolean
-    workspaceName?: string
-    workspaceExists?: boolean
-    token?: string
-}
+import { GitHubUser, branch, branchDifference, commitChange, pagedCommits, remote, remoteBranch, repository, syncStatus, userEmails } from "@remix-api"
+import { ReadCommitResult } from "isomorphic-git"
+import { Plugin } from "@remixproject/engine";
+import { CustomRemixApi } from "@remix-api"
 
-export interface repositoriesInput { token: string, page?: number, per_page?: number }
-
-export interface statusInput { ref: string, filepaths?: string[] }
-
-export const dGitProfile: LibraryProfile<IGitApi> = {
-  name: 'dgitApi',
-  methods: ['clone', 'branches', 'remotes', 'getCommitChanges', 'log', 'remotecommits'],
-}
-
-export interface customGitApi extends IRemixApi {
-    dgit: IGitApi
-}
+export interface IGitUi {
+    plugin: Plugin<any, CustomRemixApi>
+  }
 
 export type gitState = {
     currentBranch: branch
@@ -185,6 +42,10 @@ export type gitState = {
     gitHubScopes: string[]
     gitHubAccessToken: string
     log: gitLog[]
+    desktopWorkingDir?: string
+    version: string
+    timestamp: number
+    gitLogCount: number
 }
 export type gitLog = {
     type: 'error' | 'warning' | 'info' | 'success',
@@ -193,19 +54,6 @@ export type gitLog = {
 
 export type remoteBranchIdentifier = `${string}/${string}`
 
-export type branchDifference = {
-    uniqueHeadCommits: ReadCommitResult[],
-    uniqueRemoteCommits: ReadCommitResult[],
-}
-
-export type pagedCommits = {
-    page: number,
-    perPage: number,
-    total: number,
-    hasNextPage: boolean,
-    commits: ReadCommitResult[]
-}
-
 export type loaderState = {
     branches: boolean
     remotes: boolean
@@ -214,57 +62,6 @@ export type loaderState = {
     plugin: boolean
 }
 
-export type commitChangeTypes = {
-    "deleted": "D"
-    "modified": "M"
-    "added": "A",
-    "unknown": "?"
-}
-
-export enum syncStatus {
-    "sync" = "sync",
-    "publishBranch" = "publishBranch",
-    "none" = "none",
-}
-
-export type commitChangeType = keyof commitChangeTypes
-
-export type commitChange = {
-    type: commitChangeType
-    path: string,
-    hashModified: string,
-    hashOriginal: string,
-    original?: string,
-    modified?: string,
-    readonly?: boolean
-}
-
-export type repository = {
-    name: string
-    html_url: string
-    owner: {
-        login: string
-    },
-    full_name: string
-    default_branch: string
-    id: number
-    url: string
-}
-
-export type branch = {
-    name: string
-    remote: remote
-}
-
-export type remote = {
-    name: string
-    url: string
-}
-
-export type remoteBranch = {
-    name: string
-}
-
 export const defaultGitState: gitState = {
   currentBranch: { name: "", remote: { name: "", url: "" } },
   currentHead: "",
@@ -280,7 +77,7 @@ export const defaultGitState: gitState = {
   deleted: [],
   modified: [],
   allchangesnotstaged: [],
-  canUseApp: true,
+  canUseApp: false,
   loading: false,
   storage: {
     used: 0,
@@ -304,7 +101,11 @@ export const defaultGitState: gitState = {
   userEmails: [] as userEmails,
   gitHubScopes: [],
   gitHubAccessToken: "",
-  log: []
+  log: [],
+  desktopWorkingDir: null,
+  version: "",
+  timestamp: 0,
+  gitLogCount: 22
 }
 
 export const defaultLoaderState: loaderState = {
@@ -494,4 +295,14 @@ export interface clearLogAction {
     type: string
 }
 
-export type gitActionDispatch = setCurrentHeadAction | clearLogAction | setLogAction | setDefaultRemoteAction | setTokenAction | setUpstreamAction | setRemoteBranchCommitsAction | setLocalBranchCommitsAction | setBranchDifferencesAction | setRemotesAction | setCurrentBranchAction | fileStatusAction | setLoadingAction | setCanUseAppAction | setRepoNameAction | setCommitsAction | setBranchesAction | setReposAction | setRemoteBranchesAction
\ No newline at end of file
+export interface setDesktopWorkingDirAction {
+    type: string,
+    payload: string
+}
+
+export interface setTimeStampAction {
+    type: string,
+    payload: number
+}
+
+export type gitActionDispatch = setTimeStampAction |setDesktopWorkingDirAction | setCurrentHeadAction | clearLogAction | setLogAction | setDefaultRemoteAction | setTokenAction | setUpstreamAction | setRemoteBranchCommitsAction | setLocalBranchCommitsAction | setBranchDifferencesAction | setRemotesAction | setCurrentBranchAction | fileStatusAction | setLoadingAction | setCanUseAppAction | setRepoNameAction | setCommitsAction | setBranchesAction | setReposAction | setRemoteBranchesAction
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 3055d0d4e7..96deee2398 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
@@ -47,7 +47,7 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => {
     // check for filter
     if (filterCon.filter != '')
       enabled = (props.title?.toLowerCase().includes(filterCon.filter?.toLowerCase()) ||
-        props.searchKeywords?.map(keyword => keyword.toLowerCase()).some(searchKeyword => searchKeyword.toLowerCase().includes(filterCon.filter.toLocaleLowerCase())))
+        props.searchKeywords?.map(keyword => keyword?.toLowerCase()).some(searchKeyword => searchKeyword?.toLowerCase().includes(filterCon.filter?.toLocaleLowerCase())))
 
     setAnyEnabled(enabled)
   }, [filterCon, props.tagList])
diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.css b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.css
index 5c79533a71..50588fc36b 100644
--- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.css
+++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.css
@@ -21,6 +21,6 @@
 }
 
 * {
-  scrollbar-width: thin;
+  scrollbar-width: 0.5rem;
   scrollbar-color: var(--bg-dark) var(--bg-light);
-}
\ No newline at end of file
+}
diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx
index a3cb8b15c0..33fb25fb48 100644
--- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx
+++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx
@@ -1,4 +1,5 @@
 import React, {useState, useEffect, useContext, useRef, ReactNode} from 'react' // eslint-disable-line
+import { CustomTooltip } from "@remix-ui/helper";
 
 import './remix-ui-grid-section.css'
 import FiltersContext from "./filtersContext"
@@ -13,6 +14,7 @@ const _paq = window._paq = window._paq || []
 interface RemixUIGridSectionProps {
   plugin: any
   title?: string
+  tooltipTitle?: string
   hScrollable: boolean
   classList?: string
   styleList?: any
@@ -61,7 +63,7 @@ export const RemixUIGridSection = (props: RemixUIGridSectionProps) => {
       data-id={"remixUIGS" + props.title}
       style={{ overflowX: 'auto' }}
     >
-      <div className="d-flex flex-column w-100 remixui_grid_section">
+      <div className="w-100 remixui_grid_section">
         { props.title && <h6 className='mt-1 mb-0 align-items-left '>{ props.title }</h6> }
         <div className={(props.hScrollable) ? `d-flex flex-row pb-2  overflow-auto` : `d-flex flex-wrap`}>
           { !hasChildCell(children) && <span> No items found </span>}
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 da0bced867..30d99e2e8d 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
@@ -7,8 +7,11 @@ import 'react-multi-carousel/lib/styles.css'
 import * as releaseDetails from './../../../../../../releaseDetails.json'
 
 const _paq = (window._paq = window._paq || []) // eslint-disable-line
+export type HomeTabFeaturedProps = {
+  plugin: any
+  }
 
-function HomeTabFeatured() {
+function HomeTabFeatured(props:HomeTabFeaturedProps) {
   const themeFilter = useContext(ThemeContext)
 
   return (
@@ -64,23 +67,27 @@ function HomeTabFeatured() {
               </div>
               <div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
                 <a href="https://remix-project.org" target="__blank">
-                  <img src={'assets/img/bgRemi_small.webp'} className="remixui_carouselImage" alt=""></img>
+                  <img src={'assets/img/remi-prof.webp'} className="remixui_carouselImage" alt=""></img>
                 </a>
                 <div className="h6 w-50 p-2 pl-4  align-self-center" style={{ flex: '1' }}>
                   <h5>
-                    <FormattedMessage id="home.jumpIntoWeb3" />
+                    <FormattedMessage id="home.learnEthPromoTitle" />
                   </h5>
                   <div style={{ fontSize: '0.8rem', lineHeight: '1.25rem' }} className="mb-3">
-                    <FormattedMessage id="home.jumpIntoWeb3Text" />
+                    <FormattedMessage id="home.learnEthPromoText" />
                   </div>
-                  <a
+                  <span
                     className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
-                    onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'jumpIntoWeb3'])}
-                    target="__blank"
-                    href="https://remix-project.org/"
+                    style={{ cursor: 'pointer' }}
+                    onClick={async () => {
+                      await props.plugin.appManager.activatePlugin(['LearnEth', 'solidityUnitTesting'])
+                      props.plugin.verticalIcons.select('LearnEth')
+                      await props.plugin.call('LearnEth', 'home')
+                    	}
+                    }
                   >
-                    <FormattedMessage id="home.jumpIntoWeb3More" />
-                  </a>
+                    <FormattedMessage id="home.learnEthPromoButton" />
+                  </span>
                 </div>
               </div>
               <div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
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 017caea368..10cf7d82bc 100644
--- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
+++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx
@@ -67,10 +67,10 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
     plugin.verticalIcons.select('solidityStaticAnalysis')
     _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'solidityStaticAnalysis'])
   }
-  const startSourceVerify = async () => {
-    await plugin.appManager.activatePlugin(['solidity', 'sourcify'])
-    plugin.verticalIcons.select('sourcify')
-    _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'sourcify'])
+  const startLearnEth = async () => {
+    await plugin.appManager.activatePlugin(['LearnEth', 'solidity', 'solidityUnitTesting'])
+    plugin.verticalIcons.select('LearnEth')
+    _paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'LearnEth'])
   }
   const startCookbook = async () => {
     await plugin.appManager.activatePlugin(['cookbookdev'])
@@ -109,7 +109,7 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               }
             }}
             renderButtonGroupOutside={true}
-            ssr={true} // means to render carousel on server-side.
+            ssr={false} // means to render carousel on server-side.
             keyBoardControl={true}
             containerClass="carousel-container"
             deviceType={'desktop'}
@@ -125,6 +125,16 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               remixMaintained={true}
               callback={() => startCodeAnalyzer()}
             />
+            <PluginButton
+              imgPath="assets/img/learnEthLogo.webp"
+              envID="learnEthLogo"
+              envText="LearnEth Tutorials"
+              description={intl.formatMessage({
+                id: 'home.learnEthPluginDesc'
+              })}
+              remixMaintained={true}
+              callback={() => startLearnEth()}
+            />
             <PluginButton
               imgPath="assets/img/cookbook.webp"
               envID="cookbookLogo"
@@ -141,13 +151,6 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
               remixMaintained={true}
               callback={() => startSolidity()}
             />
-            <PluginButton
-              imgPath="assets/img/sourcifyNewLogo.webp"
-              envID="sourcifyLogo"
-              envText="Sourcify"
-              description={intl.formatMessage({ id: 'home.sourcifyPluginDesc' })}
-              callback={() => startSourceVerify()}
-            />
             <PluginButton
               imgPath="assets/img/unitTesting.webp"
               envID="sUTLogo"
diff --git a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
index 3153b7ac79..89d8cbca8c 100644
--- a/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
+++ b/libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
@@ -86,7 +86,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
           </div>
           <div className="pl-2 pr-3 justify-content-start d-flex flex-column" style={{ width: `${carouselWidth}%` }} id="remixUIHTRight">
             <LanguageOptions plugin={plugin}/>
-            <HomeTabFeatured></HomeTabFeatured>
+            <HomeTabFeatured plugin={plugin}></HomeTabFeatured>
             <HomeTabFeaturedPlugins plugin={plugin}></HomeTabFeaturedPlugins>
           </div>
         </div>
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 a1375b473d..8103a4e832 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/deploy.ts
@@ -9,7 +9,7 @@ import { DeployMode, MainnetPrompt } from "../types"
 import { displayNotification, fetchProxyDeploymentsSuccess, setDecodedResponse, updateInstancesBalance } from "./payload"
 import { addInstance } from "./actions"
 import { addressToString, logBuilder } from "@remix-ui/helper"
-import Web3 from "web3"
+import { Web3 } from "web3"
 
 declare global {
   interface Window {
diff --git a/libs/remix-ui/run-tab/src/lib/actions/events.ts b/libs/remix-ui/run-tab/src/lib/actions/events.ts
index 41deac6c6f..8d13ac5776 100644
--- a/libs/remix-ui/run-tab/src/lib/actions/events.ts
+++ b/libs/remix-ui/run-tab/src/lib/actions/events.ts
@@ -6,7 +6,7 @@ import { addDeployOption, clearAllInstances, clearAllPinnedInstances, clearRecor
 import { updateInstanceBalance } from './deploy'
 import { CompilerAbstract } from '@remix-project/remix-solidity'
 import BN from 'bn.js'
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 import { Plugin } from "@remixproject/engine"
 import { getNetworkProxyAddresses } from "./deploy"
 import { shortenAddress } from "@remix-ui/helper"
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 d499b9c917..4f6c2964ae 100644
--- a/libs/remix-ui/run-tab/src/lib/components/environment.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/environment.tsx
@@ -23,7 +23,7 @@ export function EnvironmentUI(props: EnvironmentProps) {
     'L2 - Arbitrum': 'https://bridge.arbitrum.io/'
   }
 
-  const isL2 = (providerDisplayName: string) => providerDisplayName === 'L2 - Optimism' || providerDisplayName === 'L2 - Arbitrum'
+  const isL2 = (providerDisplayName: string) => providerDisplayName && (providerDisplayName.startsWith('L2 - Optimism') || providerDisplayName.startsWith('L2 - Arbitrum'))
   return (
     <div className="udapp_crow">
       <label id="selectExEnv" className="udapp_settingsLabel">
@@ -44,14 +44,14 @@ export function EnvironmentUI(props: EnvironmentProps) {
           <Dropdown.Toggle as={CustomToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control" icon={null}>
             {isL2(currentProvider && currentProvider.displayName)}
             {currentProvider && currentProvider.displayName}
-            {currentProvider && bridges[currentProvider.displayName] && (
+            {currentProvider && bridges[currentProvider.displayName.substring(0, 13)] && (
               <CustomTooltip placement={'auto-end'} tooltipClasses="text-nowrap" tooltipId="info-recorder" tooltipText={<FormattedMessage id="udapp.tooltipText3" />}>
                 <i
                   style={{ fontSize: 'medium' }}
                   className={'ml-2 fa fa-rocket-launch'}
                   aria-hidden="true"
                   onClick={() => {
-                    window.open(bridges[currentProvider.displayName], '_blank')
+                    window.open(bridges[currentProvider.displayName.substring(0, 13)], '_blank')
                   }}
                 ></i>
               </CustomTooltip>
diff --git a/libs/remix-ui/run-tab/src/lib/types/execution-context.d.ts b/libs/remix-ui/run-tab/src/lib/types/execution-context.d.ts
index dd7c244c6d..83d3df2d55 100644
--- a/libs/remix-ui/run-tab/src/lib/types/execution-context.d.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/execution-context.d.ts
@@ -1,4 +1,4 @@
-import Web3 from 'web3'
+import { Web3 } from 'web3'
 
 export class ExecutionContext {
   event: any;
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
index 63296e4955..38f0f673ed 100644
--- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
+++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx
@@ -139,13 +139,11 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
   const onchangeCopilotActivate = () => {
     if (!props.useCopilot) {
       copilotActivate(props.config, props.useCopilot, dispatch)
-      props.plugin.call('terminal', 'log', { type: 'typewriterlog', value: `Solidity copilot not activated!` })
       return
     }
 
     const startCopilot = async () => {
       copilotActivate(props.config, props.useCopilot, dispatch)
-      props.plugin.call('terminal', 'log', { type: 'typewriterlog', value: `Solidity copilot activated!` })
     }
 
     startCopilot()
@@ -251,6 +249,13 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
               htmlFor="generatecontractmetadata"
             >
               <FormattedMessage id="settings.generateContractMetadataText" />
+              <CustomTooltip
+                placement="auto"
+                tooltipId="settings-tooltip-metadata"
+                tooltipText={intl.formatMessage({ id: 'settings.generateContractMetadataTooltip' })}
+              >
+                <i className="ml-1 far fa-info-circle"></i>
+              </CustomTooltip>
             </label>
           </div>
           <div className="mt-2 custom-control custom-checkbox mb-1">
@@ -298,11 +303,14 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
           <div className="custom-control custom-checkbox mb-1">
             <input onChange={onchangePersonal} id="personal" type="checkbox" className="custom-control-input" checked={isPersonalChecked} />
             <label className={`form-check-label custom-control-label align-middle ${getTextClass('settings/personal-mode')}`} htmlFor="personal">
-              <i className="fas fa-exclamation-triangle text-warning" aria-hidden="true"></i> <span> </span>
-              <span> </span>
               <FormattedMessage id="settings.enablePersonalModeText" />
-              &nbsp;
-              <FormattedMessage id="settings.warnText" />
+              <CustomTooltip
+                placement="auto"
+                tooltipId="settings-tooltip-personalMode"
+                tooltipText={intl.formatMessage({ id: 'settings.enablePersonalModeTooltip' })}
+              >
+                <i className="ml-1 fas fa-exclamation-triangle text-warning" aria-hidden="true"></i>
+              </CustomTooltip>
             </label>
           </div>
           <div className="custom-control custom-checkbox mb-1">
@@ -311,7 +319,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
               <span>
                 <FormattedMessage id="settings.matomoAnalytics" />
               </span>
-              <a href="https://medium.com/p/66ef69e14931/" target="_blank">
+              <a href="https://medium.com/remix-ide/help-us-improve-remix-ide-66ef69e14931" target="_blank">
                 {' '}
                 <FormattedMessage id="settings.analyticsInRemix" />
               </a>{' '}
@@ -319,6 +327,13 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
               <a target="_blank" href="https://matomo.org/free-software">
                 Matomo
               </a>
+              <CustomTooltip
+                placement="auto"
+                tooltipId="settings-tooltip-matomo"
+                tooltipText={intl.formatMessage({ id: 'settings.matomoAnalyticsTooltip' })}
+              >
+                <i className="ml-1 far fa-info-circle"></i>
+              </CustomTooltip>
             </label>
           </div>
           <div className="custom-control custom-checkbox mb-1">
diff --git a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
index 49aad01d31..2b3b6e0000 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
+++ b/libs/remix-ui/solidity-compiler/src/lib/logic/compileTabLogic.ts
@@ -129,26 +129,26 @@ export class CompileTabLogic {
   }
 
   async isHardhatProject () {
-    if (this.api.getFileManagerMode() === 'localhost') {
+    if (this.api.getFileManagerMode() === ('localhost') || this.api.isDesktop()) {
       return await this.api.fileExists('hardhat.config.js') || await this.api.fileExists('hardhat.config.ts')
     } else return false
   }
 
   async isTruffleProject () {
-    if (this.api.getFileManagerMode() === 'localhost') {
+    if (this.api.getFileManagerMode() === ('localhost') || this.api.isDesktop()) {
       return await this.api.fileExists('truffle-config.js')
     } else return false
   }
 
   async isFoundryProject () {
-    if (this.api.getFileManagerMode() === 'localhost') {
+    if (this.api.getFileManagerMode() === ('localhost') || this.api.isDesktop()) {
       return await this.api.fileExists('foundry.toml')
     } else return false
   }
 
   runCompiler (externalCompType) {
     try {
-      if (this.api.getFileManagerMode() === 'localhost') {
+      if (this.api.getFileManagerMode() === 'localhost' || this.api.isDesktop()) {
         if (externalCompType === 'hardhat') {
           const { currentVersion, optimize, runs } = this.compiler.state
           if (currentVersion) {
diff --git a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
index 46f13d3047..4d6f5773d6 100644
--- a/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
+++ b/libs/remix-ui/solidity-compiler/src/lib/solidity-compiler.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react' // eslint-disable-line
+import React, { useContext, useEffect, useState } from 'react' // eslint-disable-line
 import { CompileErrors, ContractsFile, SolidityCompilerProps } from './types'
 import { CompilerContainer } from './compiler-container' // eslint-disable-line
 import { ContractSelection } from './contract-selection' // eslint-disable-line
@@ -9,6 +9,7 @@ import { baseURLBin, baseURLWasm, pathToURL } from '@remix-project/remix-solidit
 import * as packageJson from '../../../../../package.json'
 import './css/style.css'
 import { iSolJsonBinData, iSolJsonBinDataBuild } from '@remix-project/remix-lib'
+import { appPlatformTypes, platformContext } from '@remix-ui/app'
 
 export const SolidityCompiler = (props: SolidityCompilerProps) => {
   const {
@@ -47,6 +48,7 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
   const [compileErrors, setCompileErrors] = useState<Record<string, CompileErrors>>({ [currentFile]: api.compileErrors })
   const [badgeStatus, setBadgeStatus] = useState<Record<string, { key: string; title?: string; type?: string }>>({})
   const [contractsFile, setContractsFile] = useState<ContractsFile>({})
+  const platform = useContext(platformContext)
 
   useEffect(() => {
     ; (async () => {
@@ -77,9 +79,12 @@ export const SolidityCompiler = (props: SolidityCompilerProps) => {
   }
 
   api.onSetWorkspace = async (isLocalhost: boolean, workspaceName: string) => {
-    const isHardhat = isLocalhost && (await compileTabLogic.isHardhatProject())
-    const isTruffle = isLocalhost && (await compileTabLogic.isTruffleProject())
-    const isFoundry = isLocalhost && (await compileTabLogic.isFoundryProject())
+    const isDesktop = platform === appPlatformTypes.desktop
+
+    const isHardhat = (isLocalhost || isDesktop) && (await compileTabLogic.isHardhatProject())
+    const isTruffle = (isLocalhost || isDesktop) && (await compileTabLogic.isTruffleProject())
+    const isFoundry = (isLocalhost || isDesktop) && (await compileTabLogic.isFoundryProject())
+
     setState((prevState) => {
       return {
         ...prevState,
diff --git a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
index 255602004f..fc6d774ce4 100644
--- a/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
+++ b/libs/remix-ui/statusbar/src/lib/components/aiStatus.tsx
@@ -14,13 +14,11 @@ export default function AIStatus(props: AIStatusProps) {
   const [copilotActive, setCopilotActive] = useState(false)
   useEffect(() => {
     const run = async () => {
-      props.plugin.on('fileManager', 'currentFileChanged', async (isAiActive) => {
-        const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
-        setCopilotActive(aiActivate)
-      })
+      const aiActivate = await props.plugin.call('settings', 'get', 'settings/copilot/suggest/activate')
+      setCopilotActive(aiActivate)
     }
     run()
-  }, [props.plugin.isAiActive, props.isAiActive])
+  }, [])
 
   useEffect(() => {
     const run = async () => {
@@ -30,14 +28,14 @@ export default function AIStatus(props: AIStatusProps) {
       })
     }
     run()
-  }, [props.plugin.isAiActive])
+  }, [props.plugin.isAiActive, props.plugin.isAiActive])
   return (
     <CustomTooltip
-      tooltipText={copilotActive ? "Remix Copilot activated" : "Remix Copilot disabled. To activate copilot, open a .sol file and toggle the ai switch at the top of the Ide"}
+      tooltipText={copilotActive ? "RemixAI Copilot enabled" : "RemixAI Copilot disabled. To enable, open a .sol file and toggle the switch at the left-top of the editor"}
     >
       <div className="d-flex flex-row pr-2 text-white justify-content-center align-items-center">
         <span className={copilotActive === false ? "small mx-1 text-white semi-bold" : "small mx-1 text-white semi-bold" }>
-          {copilotActive === false ? 'Remix Copilot (disabled)' : 'Remix Copilot (enabled)'}
+          {copilotActive === false ? 'RemixAI Copilot (disabled)' : 'RemixAI Copilot (enabled)'}
         </span>
       </div>
     </CustomTooltip>
diff --git a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
index a807151029..de67337743 100644
--- a/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
+++ b/libs/remix-ui/statusbar/src/lib/remixui-statusbar-panel.tsx
@@ -10,6 +10,7 @@ import { appPlatformTypes, platformContext } from '@remix-ui/app'
 import { StatusBar } from 'apps/remix-ide/src/app/components/status-bar'
 import { StatusBarContextProvider } from '../contexts/statusbarcontext'
 import DidYouKnow from './components/didYouKnow'
+import { appPlatformTypes, platformContext } from '@remix-ui/app'
 
 export interface RemixUIStatusBarProps {
   statusBarPlugin: StatusBar
@@ -21,6 +22,7 @@ export type ScamAlert = {
 }
 
 export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
+  const platform = useContext(platformContext)
   const [showScamDetails, setShowScamDetails] = useState(true)
   const [scamAlerts, setScamAlerts] = useState<ScamAlert[]>([])
   const [gitBranchName, setGitBranchName] = useState('')
@@ -70,7 +72,7 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
   return (
     <>
       <StatusBarContextProvider>
-        {showScamDetails && (
+        {(platform !== appPlatformTypes.desktop) && showScamDetails && (
           <FloatingFocusManager context={context} modal={false}>
             <ScamDetails refs={refs} floatStyle={{ ...floatingStyles, minHeight: 'auto', alignContent: 'center', paddingRight: '0.5rem' }} getFloatingProps={getFloatingProps} scamAlerts={scamAlerts} />
           </FloatingFocusManager>
@@ -88,9 +90,9 @@ export function RemixUIStatusBar({ statusBarPlugin }: RemixUIStatusBarProps) {
             <div className="remixui_statusbar">
               <AIStatus plugin={statusBarPlugin} aiActive={lightAiUp} isAiActive={isAiActive} setIsAiActive={setIsAiActive} />
             </div>
-            <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
+            { (platform !== appPlatformTypes.desktop) && <div className="remixui_statusbar bg-warning px-2 remixui_statusbar_custom_padding d-flex justify-center align-items-center">
               <ScamAlertStatus refs={refs} getReferenceProps={getReferenceProps} />
-            </div>
+            </div> }
           </div>
         </div>
       </StatusBarContextProvider>
diff --git a/libs/remix-ui/workspace/src/lib/actions/workspace.ts b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
index 8bd5f120e5..dbd6ba738f 100644
--- a/libs/remix-ui/workspace/src/lib/actions/workspace.ts
+++ b/libs/remix-ui/workspace/src/lib/actions/workspace.ts
@@ -43,10 +43,11 @@ import { ROOT_PATH } from '../utils/constants'
 import { IndexedDBStorage } from '../../../../../../apps/remix-ide/src/app/files/filesystems/indexedDB'
 import { getUncommittedFiles } from '../utils/gitStatusFilter'
 import { AppModal, ModalTypes } from '@remix-ui/app'
-import { branch, cloneInputType, IGitApi, gitUIPanels } from '@remix-ui/git'
+
+import { gitUIPanels } from '@remix-ui/git'
 import * as templates from '@remix-project/remix-ws-templates'
 import { Plugin } from "@remixproject/engine";
-import { CustomRemixApi } from '@remix-api'
+import { CustomRemixApi, branch, cloneInputType } from '@remix-api'
 
 declare global {
   interface Window {
@@ -220,7 +221,7 @@ export const populateWorkspace = async (
         dispatch(cloneRepositorySuccess())
       }).catch((e) => {
         dispatch(cloneRepositorySuccess())
-        plugin.call('notification', 'toast', 'error adding template ' + e.message || e)
+        plugin.call('notification', 'toast', 'error adding template ' + (e.message || e))
       })
     }, 5000)
   } else if (!isEmpty && !(isGitRepo && createCommit)) await loadWorkspacePreset(workspaceTemplateName, opts)
@@ -273,6 +274,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
       let content
 
       if (params.code) {
+        _paq.push(['trackEvent', 'workspace', 'template', 'code-template-code-param'])
         const hashed = bytesToHex(hash.keccakFromString(params.code))
 
         path = 'contract-' + hashed.replace('0x', '').substring(0, 10) + (params.language && params.language.toLowerCase() === 'yul' ? '.yul' : '.sol')
@@ -280,6 +282,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
         await workspaceProvider.set(path, content)
       }
       if (params.shareCode) {
+        _paq.push(['trackEvent', 'workspace', 'template', 'code-template-shareCode-param'])
         const host = '127.0.0.1'
         const port = 5001
         const protocol = 'http'
@@ -304,6 +307,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
         await workspaceProvider.set(path, content)
       }
       if (params.url) {
+        _paq.push(['trackEvent', 'workspace', 'template', 'code-template-url-param'])
         const data = await plugin.call('contentImport', 'resolve', params.url)
         path = data.cleanUrl
         content = data.content
@@ -327,6 +331,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
       }
       if (params.ghfolder) {
         try {
+          _paq.push(['trackEvent', 'workspace', 'template', 'code-template-ghfolder-param'])
           const files = await plugin.call('contentImport', 'resolveGithubFolder', params.ghfolder)
           for (const [path, content] of Object.entries(files)) {
             await workspaceProvider.set(path, content)
@@ -345,6 +350,7 @@ export const loadWorkspacePreset = async (template: WorkspaceTemplate = 'remixDe
   case 'gist-template':
     // creates a new workspace gist-sample and get the file from gist
     try {
+      _paq.push(['trackEvent', 'workspace', 'template', 'gist-template'])
       const gistId = params.gist
       const response: AxiosResponse = await axios.get(`https://api.github.com/gists/${gistId}`)
       const data = response.data as { files: any }
diff --git a/libs/remix-ui/workspace/src/lib/components/createModal.tsx b/libs/remix-ui/workspace/src/lib/components/createModal.tsx
new file mode 100644
index 0000000000..81b9d24a08
--- /dev/null
+++ b/libs/remix-ui/workspace/src/lib/components/createModal.tsx
@@ -0,0 +1,51 @@
+import React from 'react'
+import { FormattedMessage } from 'react-intl'
+
+export const createModalMessage = async (
+  defaultName: string,
+  gitConfigNotSet: boolean,
+  onChangeTemplateName: (name: string) => void,
+  onChangeInitGit: (name: string) => void) => {
+
+  return (
+    <>
+      <label id="wsName" className="form-check-label" style={{ fontWeight: 'bolder' }}>
+        <FormattedMessage id="filePanel.workspaceName" />
+      </label>
+      <input
+        type="text"
+        data-id="modalDialogCustomPromptTextCreate"
+        defaultValue={defaultName}
+        className="form-control"
+        onChange={(e) => onChangeTemplateName(e.target.value)}
+        onInput={(e) => onChangeTemplateName((e.target as any).value)}
+      />
+      <div className="d-flex py-2 align-items-center custom-control custom-checkbox">
+        <input
+          id="initGitRepository"
+          data-id="initGitRepository"
+          className="form-check-input custom-control-input"
+          type="checkbox"
+          disabled={gitConfigNotSet}
+          onChange={(e) => onChangeInitGit(e.target.value)}
+          onInput={(e) => onChangeInitGit((e.target as any).value)}
+        />
+        <label
+          htmlFor="initGitRepository"
+          data-id="initGitRepositoryLabel"
+          className="m-0 form-check-label custom-control-label udapp_checkboxAlign"
+          title={window._intl.formatMessage({ id: 'filePanel.initGitRepoTitle' })}
+        >
+          <FormattedMessage id="filePanel.initGitRepositoryLabel" />
+        </label>
+      </div>
+      {gitConfigNotSet ? (
+        <div className="text-warning">
+          <FormattedMessage id="filePanel.initGitRepositoryWarning" />
+        </div>
+      ) : (
+        <></>
+      )}
+    </>
+  )
+}
diff --git a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger-item.tsx b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger-item.tsx
index 25622b3c9a..f5df61691a 100644
--- a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger-item.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger-item.tsx
@@ -32,7 +32,7 @@ export function HamburgerMenuItem(props: HamburgerMenuItemProps) {
             >
               <span hidden={hideOption} id={uid} data-id={uid} className={props.fa + ' pl-2'} style={{ width: '1.4rem' }}></span>
               <span className="px-2">
-                <FormattedMessage id={'filePanel.' + props.kind} />
+                {props.kind === 'create' ? <FormattedMessage id={'filePanel.createLabel'} /> :<FormattedMessage id={'filePanel.' + props.kind} />}
               </span>
             </div>
           </CustomTooltip>
diff --git a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
index 95de007539..860ac4042e 100644
--- a/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
+++ b/libs/remix-ui/workspace/src/lib/components/workspace-hamburger.tsx
@@ -7,6 +7,7 @@ import { WorkspaceMetadata } from '../types'
 export interface HamburgerMenuProps {
   selectedWorkspace: WorkspaceMetadata
   createWorkspace: () => void
+  createBlankWorkspace: () => Promise<void>
   renameCurrentWorkspace: () => void
   downloadCurrentWorkspace: () => void
   deleteCurrentWorkspace: () => void
@@ -26,6 +27,16 @@ export function HamburgerMenu(props: HamburgerMenuProps) {
   const { showIconsMenu, hideWorkspaceOptions, hideLocalhostOptions, hideFileOperations, selectedWorkspace } = props
   return (
     <>
+      <HamburgerMenuItem
+        kind="createBlank"
+        fa="far fa-plus"
+        hideOption={hideWorkspaceOptions}
+        actionOnClick={() => {
+          props.createBlankWorkspace()
+          props.hideIconsMenu(!showIconsMenu)
+        }}
+        platforms={[appPlatformTypes.web]}
+      ></HamburgerMenuItem>
       <HamburgerMenuItem
         kind="create"
         fa="far fa-plus"
diff --git a/libs/remix-ui/workspace/src/lib/css/file-explorer.css b/libs/remix-ui/workspace/src/lib/css/file-explorer.css
index 4ccf2096c7..4e26ca94eb 100644
--- a/libs/remix-ui/workspace/src/lib/css/file-explorer.css
+++ b/libs/remix-ui/workspace/src/lib/css/file-explorer.css
@@ -70,6 +70,10 @@ ul {
     color: var(--text);
 }
 
+.remixui_avatar_user {
+    border-radius: 50% !important;
+}
+
 .remixui_selected {
 
 }
diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
index 6a7da22b21..3673851d11 100644
--- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
+++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx
@@ -14,11 +14,12 @@ import { MenuItems, WorkSpaceState, WorkspaceMetadata } from './types'
 import { contextMenuActions } from './utils'
 import FileExplorerContextMenu from './components/file-explorer-context-menu'
 import { customAction } from '@remixproject/plugin-api'
-import { appPlatformTypes, platformContext } from '@remix-ui/app'
+import { AppContext, appPlatformTypes, platformContext } from '@remix-ui/app'
 import { ElectronMenu } from './components/electron-menu'
 import { ElectronWorkspaceName } from './components/electron-workspace-name'
-import { branch } from '@remix-ui/git'
-import { publishFilesToGist } from './actions'
+import { branch } from '@remix-api'
+import { gitUIPanels } from '@remix-ui/git'
+import { createModalMessage } from './components/createModal'
 
 const _paq = (window._paq = window._paq || [])
 
@@ -50,6 +51,8 @@ export function Workspace() {
 
   const [canPaste, setCanPaste] = useState(false)
 
+  const appContext = useContext(AppContext)
+
   const [state, setState] = useState<WorkSpaceState>({
     ctrlKey: false,
     cutShortcut: false,
@@ -334,6 +337,26 @@ export function Workspace() {
     )
   }
 
+  const [counter, setCounter] = useState(1)
+  const createBlankWorkspace = async () => {
+    const username = await global.plugin.call('settings', 'get', 'settings/github-user-name')
+    const email = await global.plugin.call('settings', 'get', 'settings/github-email')
+    const gitNotSet = !username || !email
+    const defaultName = await global.plugin.call('filePanel', 'getAvailableWorkspaceName', 'blank')
+    let workspace = defaultName
+    let gitInit = false
+    setCounter((previous) => {
+      return previous + 1
+    })
+    global.modal(
+      intl.formatMessage({ id: 'filePanel.workspace.createBlank' }),
+      await createModalMessage(`blank - ${counter}`, gitNotSet, (value) => { workspace = value }, (value) => gitInit = false),
+      intl.formatMessage({ id: 'filePanel.ok' }),
+      () => global.dispatchCreateWorkspace(`blank - ${counter}`, 'blank', false),
+      intl.formatMessage({ id: 'filePanel.cancel' })
+    )
+  }
+
   const saveSampleCodeWorkspace = () => {
     const workspaceName = global.plugin.getAvailableWorkspaceName('code-sample')
     global.modal(
@@ -887,6 +910,13 @@ export function Workspace() {
       </>
     )
   }
+
+  const logInGithub = async () => {
+    await global.plugin.call('menuicons', 'select', 'dgit');
+    await global.plugin.call('dgit', 'open', gitUIPanels.GITHUB)
+    _paq.push(['trackEvent', 'Workspace', 'GIT', 'login'])
+  }
+
   return (
     <div className="d-flex flex-column justify-content-between h-100">
       <div
@@ -918,6 +948,7 @@ export function Workspace() {
                           <HamburgerMenu
                             selectedWorkspace={selectedWorkspace}
                             createWorkspace={createWorkspace}
+                            createBlankWorkspace={createBlankWorkspace}
                             renameCurrentWorkspace={renameCurrentWorkspace}
                             downloadCurrentWorkspace={downloadCurrentWorkspace}
                             deleteCurrentWorkspace={deleteCurrentWorkspace}
@@ -936,27 +967,53 @@ export function Workspace() {
                       </Dropdown>
                     </span>
                   ) : null}
-                  <span className="d-flex">
-                    <label className="pl-2 form-check-label" style={{ wordBreak: 'keep-all' }}>
-                      {(platform == appPlatformTypes.desktop) ? (
-                        <ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />
-                      ) : <FormattedMessage id='filePanel.workspace' />}
-                    </label>
-                    {selectedWorkspace && selectedWorkspace.name === 'code-sample' && <CustomTooltip
-                      placement="right"
-                      tooltipId="saveCodeSample"
-                      tooltipClasses="text-nowrap"
-                      tooltipText={<FormattedMessage id="filePanel.saveCodeSample" />}
-                    >
-                      <i onClick={() => saveSampleCodeWorkspace()} className="far fa-exclamation-triangle text-warning ml-2 align-self-center" aria-hidden="true"></i>
-                    </CustomTooltip>}
-
-                    {selectedWorkspace && selectedWorkspace.isGist && <CopyToClipboard tip={'Copy Gist ID to clipboard'} getContent={() => selectedWorkspace.isGist} direction="bottom" icon="far fa-copy">
-                      <i className="remixui_copyIcon ml-2 fab fa-github text-info" aria-hidden="true" style={{ fontSize: '1.1rem', cursor: 'pointer' }} ></i>
-                    </CopyToClipboard>
-                    }
-
-                  </span>
+                  <div className='d-flex w-100 justify-content-between'>
+                    <span className="d-flex">
+                      <label className="pl-2 form-check-label" style={{ wordBreak: 'keep-all' }}>
+                        {(platform == appPlatformTypes.desktop) ? (
+                          <ElectronWorkspaceName plugin={global.plugin} path={global.fs.browser.currentLocalFilePath} />
+                        ) : <FormattedMessage id='filePanel.workspace' />}
+                      </label>
+                      {selectedWorkspace && selectedWorkspace.name === 'code-sample' && <CustomTooltip
+                        placement="right"
+                        tooltipId="saveCodeSample"
+                        tooltipClasses="text-nowrap"
+                        tooltipText={<FormattedMessage id="filePanel.saveCodeSample" />}
+                      >
+                        <i onClick={() => saveSampleCodeWorkspace()} className="far fa-exclamation-triangle text-warning ml-2 align-self-center" aria-hidden="true"></i>
+                      </CustomTooltip>}
+
+                      {selectedWorkspace && selectedWorkspace.isGist && <CopyToClipboard tip={'Copy Gist ID to clipboard'} getContent={() => selectedWorkspace.isGist} direction="bottom" icon="far fa-copy">
+                        <i className="remixui_copyIcon ml-2 fab fa-github text-info" aria-hidden="true" style={{ fontSize: '1.1rem', cursor: 'pointer' }} ></i>
+                      </CopyToClipboard>
+                      }
+                    </span>
+                    <span className="d-flex" style={{ cursor: 'pointer' }} >
+                      {
+                        (!appContext.appState.gitHubUser || !appContext.appState.gitHubUser.isConnected) && <CustomTooltip
+                          placement="right"
+                          tooltipId="githubNotLogged"
+                          tooltipClasses="text-nowrap"
+                          tooltipText={<FormattedMessage id="filePanel.logInGithub" />}
+                        >
+                          <div data-id='filepanel-login-github' className='d-flex'>
+                            <i onClick={() => logInGithub() } className="fa-brands fa-github-alt ml-2 align-self-center" style={{ fontSize: '1.1rem', cursor: 'pointer' }} aria-hidden="true"></i>
+                            <span onClick={() => logInGithub() } className="ml-1"> Sign in </span>
+                          </div>
+                        </CustomTooltip>
+                      }
+                      {
+                        appContext.appState.gitHubUser && appContext.appState.gitHubUser.isConnected && <CustomTooltip
+                          placement="right"
+                          tooltipId="githubLoggedIn"
+                          tooltipClasses="text-nowrap"
+                          tooltipText={appContext.appState.gitHubUser && intl.formatMessage({ id: 'filePanel.gitHubLoggedAs' }, { githubuser: appContext.appState.gitHubUser.login }) || ''}
+                        >
+                          <img width={20} height={20} data-id={`filepanel-connected-img-${appContext.appState.gitHubUser && appContext.appState.gitHubUser.login}`} src={appContext.appState.gitHubUser && appContext.appState.gitHubUser.avatar_url} className="remixui_avatar_user ml-2" />
+                        </CustomTooltip>
+                      }
+                    </span>
+                  </div>
                 </div>
                 <div className='mx-2'>
                   {(platform !== appPlatformTypes.desktop) ? (
@@ -1198,22 +1255,32 @@ export function Workspace() {
           <div className="d-flex justify-content-between p-1">
             <div className="text-uppercase text-dark pt-1 px-1">GIT</div>
             { selectedWorkspace.hasGitSubmodules?
-              <CustomTooltip
-                placement="top"
-                tooltipId="updateSubmodules"
-                tooltipClasses="text-nowrap"
-                tooltipText={<FormattedMessage id="filePanel.updateSubmodules" />}
-              >
-                <div className="pr-1">
-                  { global.fs.browser.isRequestingCloning ? <button style={{ height: 30, minWidth: "9rem" }} className='btn btn-sm border text-dark'>
-                    <i className="fad fa-spinner fa-spin"></i>
-                  Updating submodules
-                  </button> :
+
+              <div className="pr-1">
+                { global.fs.browser.isRequestingCloning ?
+                  <CustomTooltip
+                    placement="top"
+                    tooltipId="updatingSubmodules"
+                    tooltipClasses="text-nowrap"
+                    tooltipText={"Updating submodules"}
+                  >
+                    <button style={{ height: 30, minWidth: "9rem" }} className='btn btn-sm border text-dark'>
+                      <i className="fad fa-spinner fa-spin mr-2"></i>
+                        Updating...
+                    </button>
+                  </CustomTooltip> :
+                  <CustomTooltip
+                    placement="top"
+                    tooltipId="updateSubmodules"
+                    tooltipClasses="text-nowrap"
+                    tooltipText={<FormattedMessage id="filePanel.updateSubmodules" />}
+                  >
                     <button style={{ height: 30, minWidth: "9rem" }} onClick={updateSubModules} data-id='updatesubmodules' className={`btn btn-sm border  ${highlightUpdateSubmodules ? 'text-warning' : 'text-dark'}`}>
-                    Update submodules
-                    </button> }
-                </div>
-              </CustomTooltip>
+                       Update submodules
+                    </button>
+                  </CustomTooltip>
+                }
+              </div>
               : null
             }
             <CustomTooltip
diff --git a/libs/remix-ui/workspace/src/lib/types/index.ts b/libs/remix-ui/workspace/src/lib/types/index.ts
index 9f21c799bf..214c1196b2 100644
--- a/libs/remix-ui/workspace/src/lib/types/index.ts
+++ b/libs/remix-ui/workspace/src/lib/types/index.ts
@@ -6,7 +6,7 @@ import { RemixAppManager } from 'libs/remix-ui/plugin-manager/src/types'
 import { ViewPlugin } from '@remixproject/engine-web'
 import { appPlatformTypes } from '@remix-ui/app'
 import { Placement } from 'react-bootstrap/esm/Overlay'
-import { branch } from '@remix-ui/git'
+import { branch } from '@remix-api'
 
 export type action = { name: string, type?: Array<WorkspaceElement>, path?: string[], extension?: string[], pattern?: string[], id: string, multiselect: boolean, label: string, sticky?: boolean, group: number, platform?: appPlatformTypes }
 export interface JSONStandardInput {
diff --git a/libs/remix-ui/workspace/src/lib/utils/constants.ts b/libs/remix-ui/workspace/src/lib/utils/constants.ts
index fcde9c1830..1d28b8d40a 100644
--- a/libs/remix-ui/workspace/src/lib/utils/constants.ts
+++ b/libs/remix-ui/workspace/src/lib/utils/constants.ts
@@ -34,6 +34,90 @@ export const TEMPLATE_METADATA: Record<string, TemplateType> = {
     name: 'cookbookdev',
     endpoint: 'openPattern',
     params: ['Uniswap-V4-HookBook-MultiSigSwapHook', true]
+  },
+  'token-sale': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['token-sale']
+  },
+  'simple-nft-sale': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['simple-nft-sale']
+  },
+  'Azuki-ERC721A-NFT-Sale-basic': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['Azuki-ERC721A-NFT-Sale-basic']
+  },
+  'Azuki-ERC721A-ERC721A': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['Azuki-ERC721A-ERC721A']
+  },
+  'token-staking-with-infinite-rewards': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['token-staking-with-infinite-rewards']
+  },
+  'nft-staking-with-infinite-rewards': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['nft-staking-with-infinite-rewards']
+  },
+  'basic-dao': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['basic-dao']
+  },
+  'soulbound-nft': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['soulbound-nft']
+  },
+  'multi-collection-nft-with-burnable-nfts-and-pausable-transfers': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openContract',
+    params: ['multi-collection-nft-with-burnable-nfts-and-pausable-transfers']
+  },
+  'OpenSea-Seaport': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openProtocol',
+    params: ['OpenSea-Seaport']
+  },
+  'Ethereum-Name-Service': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openProtocol',
+    params: ['Ethereum-Name-Service']
+  },
+  'Umbra-Cash': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openProtocol',
+    params: ['Umbra-Cash']
+  },
+  'Aave-V3': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openProtocol',
+    params: ['Aave-V3']
+  },
+  'ChainLink': {
+    type: 'plugin',
+    name: 'cookbookdev',
+    endpoint: 'openProtocol',
+    params: ['ChainLink']
   }
 }
 
diff --git a/libs/remix-url-resolver/package.json b/libs/remix-url-resolver/package.json
index 415143f95d..f775b72458 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.85",
+  "version": "0.0.86",
   "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": "57f4196f41faf8a2879a8013327f5e275e623444"
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01"
 }
\ No newline at end of file
diff --git a/libs/remix-ws-templates/package.json b/libs/remix-ws-templates/package.json
index c26118f563..1787101d43 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.50",
+  "version": "1.0.51",
   "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": "57f4196f41faf8a2879a8013327f5e275e623444"
+  "gitHead": "28b25d08084ff0dd952f2cd649dbcd1c1ab30e01"
 }
\ No newline at end of file
diff --git a/libs/remixd/package.json b/libs/remixd/package.json
index 118affc943..0da157670c 100644
--- a/libs/remixd/package.json
+++ b/libs/remixd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@remix-project/remixd",
-  "version": "0.6.36",
+  "version": "0.6.37",
   "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/package.json b/package.json
index d93aae6dfa..31668fbca0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remix-project",
-  "version": "0.54.0-dev",
+  "version": "0.55.0-dev",
   "license": "MIT",
   "description": "Ethereum Remix Monorepo",
   "main": "index.js",
@@ -92,11 +92,11 @@
     "@erebos/bzz-node": "^0.13.0",
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/common": "4.4.0",
-    "@ethereumjs/evm": "3.1.0",
+    "@ethereumjs/evm": "3.1.1",
     "@ethereumjs/statemanager": "2.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
+    "@ethereumjs/vm": "8.1.1",
     "@ethersphere/bee-js": "^3.2.0",
     "@floating-ui/react": "^0.26.15",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
@@ -382,11 +382,11 @@
     "@ethereumjs/blockchain": "7.3.0",
     "@ethereumjs/block": "5.3.0",
     "@ethereumjs/common": "4.4.0",
-    "@ethereumjs/evm": "3.1.0",
+    "@ethereumjs/evm": "3.1.1",
     "@ethereumjs/statemanager": "2.4.0",
     "@ethereumjs/tx": "5.4.0",
     "@ethereumjs/util": "9.1.0",
-    "@ethereumjs/vm": "8.1.0",
+    "@ethereumjs/vm": "8.1.1",
     "@ethereumjs/trie": "6.2.1"
   }
 }
diff --git a/releaseDetails.json b/releaseDetails.json
index 241101d8b9..15b21653c2 100644
--- a/releaseDetails.json
+++ b/releaseDetails.json
@@ -1,11 +1,13 @@
 {
-    "version": "v0.53.0",
+    "version": "v0.54.0",
     "title": "RELEASE HIGHLIGHTS",
-    "highlight1": "Keyboard shortcut for Cut-Copy-Paste files and folder",
-    "highlight2": "Interface to generate proof in Circom compiler plugin",
-    "highlight3": "Publish multi-selected files to Gist",
+    "highlight1": "Login to GitHub from 'File Explorer'",
+    "highlight2": "Added Cookbook workspace templates",
+    "highlight3": "Added 'sendRawTransaction' API to remix-simulator",
     "highlight4": "",
     "more": "Read More",
-    "moreLink": "https://medium.com/remix-ide/remix-release-v0-53-0-615d9e7c6c58?source=friends_link&sk=35e918e8487aaab02e79ea4dc557a7e7"
+    "moreLink": "https://medium.com/remix-ide/remix-release-v0-54-0-021575d54849?source=friends_link&sk=e3960ba90994b63993987b007ee3ac63"
   }
   
+
+  
\ No newline at end of file
diff --git a/tsconfig.paths.json b/tsconfig.paths.json
index e69a28a187..d373a783b1 100644
--- a/tsconfig.paths.json
+++ b/tsconfig.paths.json
@@ -187,6 +187,9 @@
             ],
             "@remix-api": [
               "libs/remix-api/src/index.ts"
+            ],
+            "@remix-git": [
+              "libs/remix-git/"
             ]
         }
     }