diff --git a/.circleci/config.yml b/.circleci/config.yml
index 16e3f63cdf..1502767549 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -120,7 +120,12 @@ jobs:
         - run: unzip ./persist/desktopbuild.zip
         - run: 
             command: |
+                nvm install 20.2
+                nvm use 20.2
                 node -v
+                npm install --global yarn node-gyp
+                python -m pip install --upgrade pip
+                pip install setuptools
                 mkdir apps/remixdesktop/build
                 cp -r dist/apps/remix-ide apps/remixdesktop/build
                 cd apps/remixdesktop/
@@ -131,8 +136,15 @@ jobs:
         - run:  
             name: "Run tests"
             command: |
+              nvm use 20.2
               cd apps/remixdesktop/
               ./run_ci_test.sh
+        - run:  
+            name: "Run isogit tests"
+            command: |
+              nvm use 20.2
+              cd apps/remixdesktop/
+              ./run_git_ui_isogit_tests.sh
         - store_test_results:
             path: ./apps/remixdesktop/reports/tests
         - store_artifacts:
@@ -152,7 +164,12 @@ jobs:
         - run: unzip ./persist/desktopbuild.zip
         - run: 
             command: |
+                nvm install 20.2
+                nvm use 20.2
                 node -v
+                npm install --global yarn node-gyp
+                python -m pip install --upgrade pip
+                pip install setuptools
                 mkdir apps/remixdesktop/build
                 cp -r dist/apps/remix-ide apps/remixdesktop/build
                 cd apps/remixdesktop/
@@ -190,36 +207,28 @@ jobs:
       - attach_workspace:
           at: .
       - run: unzip ./persist/desktopbuild.zip
-      - restore_cache:
-          key: node-20-windows-v3
+
       - run: 
           command: |
-            nvm install 20.0.0
-            nvm use 20.0.0
+            nvm install 20.2
+            nvm use 20.2
             node -v
             npx -v
             npm install --global yarn
+            npm install --global node-gyp
             yarn -v 
-      - save_cache:
-          key: node-20-windows-v3
-          paths:
-            - /ProgramData/nvm/v20.0.0
-      - restore_cache:
-          keys:
-            - remixdesktop-windows-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
+
       - run: 
           command: |
               mkdir apps/remixdesktop/build
               cp -r dist/apps/remix-ide apps/remixdesktop/build
               cd apps/remixdesktop/
+              python -m pip install --upgrade pip
               pip install setuptools
               yarn
               ./rundist.bash
               rm -rf release/*-unpacked
-      - save_cache:
-          key: remixdesktop-windows-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
-          paths:
-            - apps/remixdesktop/node_modules
+
       - persist_to_workspace:
             root: apps/remixdesktop
             paths:
@@ -233,19 +242,34 @@ jobs:
     parallelism: 10
     working_directory: ~/remix-project
     steps:
+      - run:
+          name: Restart local mstsc
+          command: psexec64.exe -accepteula -nobanner -i 0 mstsc /v:localhost /w:2560 /h:1140
+          background: true
+          shell: powershell.exe
+      - run: 
+          name: Naive impl to wait until the screen stretches 
+          command: Start-Sleep 5
+          shell: powershell.exe
+      - run:
+          name: Get screen info
+          command: |
+            Add-Type -AssemblyName System.Windows.Forms
+            [System.Windows.Forms.Screen]::AllScreens | fl *
+          shell: powershell.exe
       - checkout
       - attach_workspace:
           at: .
       - run: unzip ./persist/desktopbuild.zip
-      - restore_cache:
-          key: node-20-windows-v3
+
       - run: 
           command: |
-            nvm install 20.0.0
-            nvm use 20.0.0
+            nvm install 20.2
+            nvm use 20.2
             node -v
             npx -v
             npm install --global yarn
+            npm install --global node-gyp
             yarn -v 
       - run:
           name: start selenium
@@ -253,30 +277,32 @@ jobs:
             cd "apps/remixdesktop/"
             yarn -v
           shell: powershell.exe      
-      - save_cache:
-          key: node-20-windows-v3
-          paths:
-            - /ProgramData/nvm/v20.0.0
-      - restore_cache:
-          keys:
-            - remixdesktop-windows-deps-{{ checksum "apps/remixdesktop/yarn.lock" }}
+
       - run: 
           command: |
               mkdir apps/remixdesktop/build
               cp -r dist/apps/remix-ide apps/remixdesktop/build
               cd apps/remixdesktop/
-              nvm use 20.0.0
+              nvm use 20.2
               node -v
+              python -m pip install --upgrade pip
               pip install setuptools
               yarn
               ./rundist.bash
       - run:
-          name: start tests offline
+          name: run tests
           command: |
             cd "apps/remixdesktop/"
             yarn -v
             sleep 15
             ./run_ci_test.sh  
+      - run:  
+          name: "Run isogit tests"
+          command: |
+            cd apps/remixdesktop/
+            yarn -v
+            sleep 15
+            ./run_git_ui_isogit_tests.sh
       - store_test_results:
           path: ./apps/remixdesktop/reports/tests
       - store_artifacts:
@@ -423,15 +449,17 @@ jobs:
       - run: 
           command: |
             ls -la dist/apps/remix-ide
-            nvm install 20.0.0
-            nvm use 20.0.0
+            nvm install 20.2
+            nvm use 20.2
       - restore_cache:
           keys:
             - remixdesktop-deps-mac-{{ checksum "apps/remixdesktop/yarn.lock" }}
       - run: 
           command: |
-            nvm use 20.0.0
-            cd apps/remixdesktop && yarn
+            nvm use 20.2
+            cd apps/remixdesktop 
+            yarn || yarn
+            find ./node_modules
             yarn add @remix-project/remix-ws-templates
       - save_cache:
           key: remixdesktop-deps-mac-{{ checksum "apps/remixdesktop/yarn.lock" }}
@@ -440,14 +468,14 @@ jobs:
       # use USE_HARD_LINK=false https://github.com/electron-userland/electron-builder/issues/3179
       - run: 
           command: |
-            nvm use 20
+            nvm use 20.2
             mkdir apps/remixdesktop/build
             cp -r dist/apps/remix-ide apps/remixdesktop/build
             cd apps/remixdesktop
             yarn
       - run: 
           command: |
-            nvm use 20
+            nvm use 20.2
             cd apps/remixdesktop
             yarn installRipGrepMacOX<< parameters.arch >>
             PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false ./rundist.bash --<< parameters.arch >>
@@ -455,6 +483,7 @@ jobs:
               cat release/latest-mac.yml
               mv release/latest-mac.yml release/latest-mac-<< parameters.arch >>.yml
             fi
+            find build
       - run:
           name: Notarize the app
           command: |
@@ -490,15 +519,16 @@ jobs:
       - run: 
           command: |
             ls -la dist/apps/remix-ide
-            nvm install 20.0.0
-            nvm use 20.0.0
+            nvm install 20.2
+            nvm use 20.2
       - restore_cache:
           keys:
             - remixdesktop-deps-mac-{{ checksum "apps/remixdesktop/yarn.lock" }}
       - run: 
           command: |
-            nvm use 20.0.0
-            cd apps/remixdesktop && yarn
+            nvm use 20.2
+            cd apps/remixdesktop 
+            yarn || yarn
             yarn add @remix-project/remix-ws-templates
       - save_cache:
           key: remixdesktop-deps-mac-{{ checksum "apps/remixdesktop/yarn.lock" }}
@@ -506,23 +536,30 @@ jobs:
             - apps/remixdesktop/node_modules
       - run: 
           command: |
-            nvm use 20
+            nvm use 20.2
             mkdir apps/remixdesktop/build
             cp -r dist/apps/remix-ide apps/remixdesktop/build
             cd apps/remixdesktop
             yarn
       - run: 
           command: |
-            nvm use 20
+            nvm use 20.2
             cd apps/remixdesktop
             yarn installRipGrepMacOXarm64
-            PUBLISH_FOR_PULL_REQUEST='false' USE_HARD_LINKS=false ./rundist.bash --arm64
+            PUBLISH_FOR_PULL_REQUEST='false' DO_NOT_NOTARIZE='true' USE_HARD_LINKS=false ./rundist.bash --arm64   
+            find build
       - run:
           name: "Run tests"
           command: |
-            nvm use 20
+            nvm use 20.2
             cd apps/remixdesktop
             ./run_ci_test.sh  
+      - run:
+          name: "Run isogit tests"
+          command: |
+            nvm use 20.2
+            cd apps/remixdesktop
+            ./run_git_ui_isogit_tests.sh
       - store_test_results:
           path: ./apps/remixdesktop/reports/tests
       - store_artifacts:
@@ -645,7 +682,7 @@ jobs:
 
   tests-passed:
     machine:
-      image: ubuntu-2004:202010-01
+      image: default
     steps:
       - run: echo done