diff --git a/.vscode/launch.json b/.vscode/launch.json
index 802b130d6..820ba07b8 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -20,7 +20,6 @@
         "--no-app-auto-install",
         "--plugins=local-dir:../plugins",
         "--hosted-plugin-inspect=9339",
-        "--nosplash",
         "--content-trace",
         "--open-devtools"
       ],
diff --git a/BUILDING.md b/BUILDING.md
index ed13b2e93..15499bfdd 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -41,7 +41,7 @@ The _frontend_ is running as an Electron renderer process and can invoke service
 
 If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the
 project, you should be able to build the Arduino IDE locally.
-Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions.
+Please refer to the [Theia IDE prerequisites](https://github.com/eclipse-theia/theia/blob/master/doc/Developing.md#prerequisites) documentation for the setup instructions.
 > **Note**: Node.js 14 must be used instead of the version 12 recommended at the link above.
 
 Once you have all the tools installed, you can build the editor following these steps
@@ -89,7 +89,6 @@ This project is built on [GitHub Actions](https://github.com/arduino/arduino-ide
     git push origin 1.2.3
    ```
 
-
 ## Notes for macOS contributors
 Beginning in macOS 10.14.5, the software [must be notarized to run](https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution). The signing and notarization processes for the Arduino IDE are managed by our Continuous Integration (CI) workflows, implemented with GitHub Actions. On every push and pull request, the Arduino IDE is built and saved to a workflow artifact. These artifacts can be used by contributors and beta testers who don't want to set up a build system locally.
 For security reasons, signing and notarization are disabled for workflow runs for pull requests from forks of this repository. This means that macOS will block you from running those artifacts.
diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json
index 713c7868c..18f48dadc 100644
--- a/arduino-ide-extension/package.json
+++ b/arduino-ide-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.0.0-rc9.1",
+  "version": "2.0.0-rc9.2",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -150,13 +150,17 @@
       "frontend": "lib/browser/theia/core/browser-menu-module",
       "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module"
     },
+    {
+      "frontend": "lib/browser/theia/core/browser-window-module",
+      "frontendElectron": "lib/electron-browser/theia/core/electron-window-module"
+    },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
   ],
   "arduino": {
     "cli": {
-      "version": "0.25.1"
+      "version": "0.26.0-rc.1"
     },
     "fwuploader": {
       "version": "2.2.0"
diff --git a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts
index c66b41865..7c75c7225 100644
--- a/arduino-ide-extension/src/browser/contributions/edit-contributions.ts
+++ b/arduino-ide-extension/src/browser/contributions/edit-contributions.ts
@@ -141,6 +141,11 @@ ${value}
       label: nls.localize('arduino/editor/decreaseIndent', 'Decrease Indent'),
       order: '2',
     });
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.AUTO_FORMAT.id,
+      label: nls.localize('arduino/editor/autoFormat', 'Auto Format'),
+      order: '3',
+    });
 
     registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
       commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
@@ -248,10 +253,13 @@ ${value}
     });
   }
 
-  protected async current(): Promise<ICodeEditor | StandaloneCodeEditor  | undefined> {
+  protected async current(): Promise<
+    ICodeEditor | StandaloneCodeEditor | undefined
+  > {
     return (
       this.codeEditorService.getFocusedCodeEditor() ||
-      this.codeEditorService.getActiveCodeEditor() || undefined
+      this.codeEditorService.getActiveCodeEditor() ||
+      undefined
     );
   }
 
diff --git a/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts b/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts
index 5010c5fc9..8f469ee7d 100644
--- a/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts
+++ b/arduino-ide-extension/src/browser/contributions/first-startup-installer.ts
@@ -43,7 +43,7 @@ export class FirstStartupInstaller extends Contribution {
             // If arduino:avr installation fails because it's already installed we don't want to retry on next start-up
             console.error(e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             avrPackageError = e;
           }
         }
@@ -64,7 +64,7 @@ export class FirstStartupInstaller extends Contribution {
             // If Arduino_BuiltIn installation fails because it's already installed we don't want to retry on next start-up
             console.log('error installing core', e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             builtInLibraryError = e;
           }
         }
diff --git a/arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx b/arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx
index 4a9d2f4da..21ec1586b 100644
--- a/arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx
+++ b/arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx
@@ -19,6 +19,7 @@ import { CommandRegistry } from '@theia/core/lib/common/command';
 import { certificateList, sanifyCertString } from './utils';
 import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader';
 import { nls } from '@theia/core/lib/common';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 
 @injectable()
 export class UploadCertificateDialogWidget extends ReactWidget {
@@ -37,6 +38,9 @@ export class UploadCertificateDialogWidget extends ReactWidget {
   @inject(ArduinoFirmwareUploader)
   protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
 
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
+
   protected certificates: string[] = [];
   protected updatableFqbns: string[] = [];
   protected availableBoards: AvailableBoard[] = [];
@@ -66,10 +70,12 @@ export class UploadCertificateDialogWidget extends ReactWidget {
       }
     });
 
-    this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => {
-      this.updatableFqbns = fqbns;
-      this.update();
-    });
+    this.appStateService.reachedState('ready').then(() =>
+      this.arduinoFirmwareUploader.updatableBoards().then((fqbns) => {
+        this.updatableFqbns = fqbns;
+        this.update();
+      })
+    );
 
     this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => {
       this.availableBoards = availableBoards;
diff --git a/arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx b/arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx
index 6bbc3c4c1..dc3d00252 100644
--- a/arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx
+++ b/arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx
@@ -201,12 +201,7 @@ export class SettingsComponent extends React.Component<
             <div className="flex-line">
               <select
                 className="theia-select"
-                value={
-                  ThemeService.get()
-                    .getThemes()
-                    .find(({ id }) => id === this.state.themeId)?.label ||
-                  nls.localize('arduino/common/unknown', 'Unknown')
-                }
+                value={ThemeService.get().getCurrentTheme().label}
                 onChange={this.themeDidChange}
               >
                 {ThemeService.get()
@@ -591,6 +586,9 @@ export class SettingsComponent extends React.Component<
     const theme = ThemeService.get().getThemes()[selectedIndex];
     if (theme) {
       this.setState({ themeId: theme.id });
+      if (ThemeService.get().getCurrentTheme().id !== theme.id) {
+        ThemeService.get().setCurrentTheme(theme.id);
+      }
     }
   };
 
diff --git a/arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx b/arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx
index 7e27def2a..62d67859c 100644
--- a/arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx
+++ b/arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx
@@ -16,6 +16,7 @@ import { SettingsComponent } from './settings-component';
 import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
 import { AdditionalUrls } from '../../../common/protocol';
 import { AbstractDialog } from '../../theia/dialogs/dialogs';
+import { ThemeService } from '@theia/core/lib/browser/theming';
 
 @injectable()
 export class SettingsWidget extends ReactWidget {
@@ -118,6 +119,17 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
 
     this.widget.activate();
   }
+
+  override async open(): Promise<Promise<Settings> | undefined> {
+    const themeIdBeforeOpen = ThemeService.get().getCurrentTheme().id;
+    const result = await super.open();
+    if (!result) {
+      if (ThemeService.get().getCurrentTheme().id !== themeIdBeforeOpen) {
+        ThemeService.get().setCurrentTheme(themeIdBeforeOpen);
+      }
+    }
+    return result;
+  }
 }
 
 export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
diff --git a/arduino-ide-extension/src/browser/dialogs/settings/settings.ts b/arduino-ide-extension/src/browser/dialogs/settings/settings.ts
index 3bd5f13c8..7033f8e8a 100644
--- a/arduino-ide-extension/src/browser/dialogs/settings/settings.ts
+++ b/arduino-ide-extension/src/browser/dialogs/settings/settings.ts
@@ -111,9 +111,11 @@ export class SettingsService {
 
   @postConstruct()
   protected async init(): Promise<void> {
-    const settings = await this.loadSettings();
-    this._settings = deepClone(settings);
-    this.ready.resolve();
+    this.appStateService.reachedState('ready').then(async () => {
+      const settings = await this.loadSettings();
+      this._settings = deepClone(settings);
+      this.ready.resolve();
+    });
   }
 
   protected async loadSettings(): Promise<Settings> {
diff --git a/arduino-ide-extension/src/browser/theia/core/browser-window-module.ts b/arduino-ide-extension/src/browser/theia/core/browser-window-module.ts
new file mode 100644
index 000000000..ac0862b75
--- /dev/null
+++ b/arduino-ide-extension/src/browser/theia/core/browser-window-module.ts
@@ -0,0 +1,10 @@
+import { DefaultWindowService as TheiaDefaultWindowService } from '@theia/core/lib/browser/window/default-window-service';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { DefaultWindowService } from './default-window-service';
+import { WindowServiceExt } from './window-service-ext';
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+  bind(DefaultWindowService).toSelf().inSingletonScope();
+  rebind(TheiaDefaultWindowService).toService(DefaultWindowService);
+  bind(WindowServiceExt).toService(DefaultWindowService);
+});
diff --git a/arduino-ide-extension/src/browser/theia/core/default-window-service.ts b/arduino-ide-extension/src/browser/theia/core/default-window-service.ts
new file mode 100644
index 000000000..145691727
--- /dev/null
+++ b/arduino-ide-extension/src/browser/theia/core/default-window-service.ts
@@ -0,0 +1,17 @@
+import { DefaultWindowService as TheiaDefaultWindowService } from '@theia/core/lib/browser/window/default-window-service';
+import { injectable } from '@theia/core/shared/inversify';
+import { WindowServiceExt } from './window-service-ext';
+
+@injectable()
+export class DefaultWindowService
+  extends TheiaDefaultWindowService
+  implements WindowServiceExt
+{
+  /**
+   * The default implementation always resolves to `true`.
+   * IDE2 does not use it. It's currently an electron-only app.
+   */
+  async isFirstWindow(): Promise<boolean> {
+    return true;
+  }
+}
diff --git a/arduino-ide-extension/src/browser/theia/core/window-service-ext.ts b/arduino-ide-extension/src/browser/theia/core/window-service-ext.ts
new file mode 100644
index 000000000..f22e55cc4
--- /dev/null
+++ b/arduino-ide-extension/src/browser/theia/core/window-service-ext.ts
@@ -0,0 +1,7 @@
+export const WindowServiceExt = Symbol('WindowServiceExt');
+export interface WindowServiceExt {
+  /**
+   * Returns with a promise that resolves to `true` if the current window is the first window.
+   */
+  isFirstWindow(): Promise<boolean>;
+}
diff --git a/arduino-ide-extension/src/browser/theia/messages/notifications-renderer.tsx b/arduino-ide-extension/src/browser/theia/messages/notifications-renderer.tsx
index fa0acc533..56652d66a 100644
--- a/arduino-ide-extension/src/browser/theia/messages/notifications-renderer.tsx
+++ b/arduino-ide-extension/src/browser/theia/messages/notifications-renderer.tsx
@@ -1,12 +1,29 @@
 import * as React from '@theia/core/shared/react';
 import * as ReactDOM from '@theia/core/shared/react-dom';
-import { injectable } from '@theia/core/shared/inversify';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
 import { NotificationCenterComponent } from './notification-center-component';
 import { NotificationToastsComponent } from './notification-toasts-component';
 import { NotificationsRenderer as TheiaNotificationsRenderer } from '@theia/messages/lib/browser/notifications-renderer';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 
 @injectable()
 export class NotificationsRenderer extends TheiaNotificationsRenderer {
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
+
+  @postConstruct()
+  protected override init(): void {
+    // Unlike Theia, IDE2 renders the notification area only when the app is ready.
+    this.appStateService.reachedState('ready').then(() => {
+      this.createOverlayContainer();
+      this.render();
+    });
+  }
+
   protected override render(): void {
     ReactDOM.render(
       <div>
diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts
index bed0179ee..101e44b56 100644
--- a/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts
+++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts
@@ -1,14 +1,7 @@
 import { ContainerModule } from '@theia/core/shared/inversify';
-import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { ElectronMainMenuFactory as TheiaElectronMainMenuFactory } from '@theia/core/lib/electron-browser/menu/electron-main-menu-factory';
 import { ElectronMenuContribution as TheiaElectronMenuContribution } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
-import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
-import {
-  SplashService,
-  splashServicePath,
-} from '../../../electron-common/splash-service';
 import { MainMenuManager } from '../../../common/main-menu-manager';
-import { ElectronWindowService } from '../../electron-window-service';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
 import { ElectronMenuContribution } from './electron-menu-contribution';
 import { nls } from '@theia/core/lib/common/nls';
@@ -16,23 +9,25 @@ import { nls } from '@theia/core/lib/common/nls';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import * as dialogs from '@theia/core/lib/browser/dialogs';
 
-
 Object.assign(dialogs, {
   confirmExit: async () => {
     const messageBoxResult = await remote.dialog.showMessageBox(
       remote.getCurrentWindow(),
       {
-        message: nls.localize('theia/core/quitMessage', 'Any unsaved changes will not be saved.'),
-        title: nls.localize('theia/core/quitTitle', 'Are you sure you want to quit?'),
+        message: nls.localize(
+          'theia/core/quitMessage',
+          'Any unsaved changes will not be saved.'
+        ),
+        title: nls.localize(
+          'theia/core/quitTitle',
+          'Are you sure you want to quit?'
+        ),
         type: 'question',
-        buttons: [
-          dialogs.Dialog.CANCEL,
-          dialogs.Dialog.YES,
-        ],
+        buttons: [dialogs.Dialog.CANCEL, dialogs.Dialog.YES],
       }
-    )
+    );
     return messageBoxResult.response === 1;
-  }
+  },
 });
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -41,14 +36,4 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaElectronMenuContribution).toService(ElectronMenuContribution);
   bind(ElectronMainMenuFactory).toSelf().inSingletonScope();
   rebind(TheiaElectronMainMenuFactory).toService(ElectronMainMenuFactory);
-  bind(ElectronWindowService).toSelf().inSingletonScope();
-  rebind(WindowService).toService(ElectronWindowService);
-  bind(SplashService)
-    .toDynamicValue((context) =>
-      ElectronIpcConnectionProvider.createProxy(
-        context.container,
-        splashServicePath
-      )
-    )
-    .inSingletonScope();
 });
diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts
new file mode 100644
index 000000000..52a5eb272
--- /dev/null
+++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-module.ts
@@ -0,0 +1,23 @@
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { WindowServiceExt } from '../../../browser/theia/core/window-service-ext';
+import {
+  ElectronMainWindowServiceExt,
+  electronMainWindowServiceExtPath,
+} from '../../../electron-common/electron-main-window-service-ext';
+import { ElectronWindowService } from './electron-window-service';
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+  bind(ElectronWindowService).toSelf().inSingletonScope();
+  rebind(WindowService).toService(ElectronWindowService);
+  bind(WindowServiceExt).toService(ElectronWindowService);
+  bind(ElectronMainWindowServiceExt)
+    .toDynamicValue(({ container }) =>
+      ElectronIpcConnectionProvider.createProxy(
+        container,
+        electronMainWindowServiceExtPath
+      )
+    )
+    .inSingletonScope();
+});
diff --git a/arduino-ide-extension/src/electron-browser/electron-window-service.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts
similarity index 58%
rename from arduino-ide-extension/src/electron-browser/electron-window-service.ts
rename to arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts
index 1407ac425..d0d0a1ef2 100644
--- a/arduino-ide-extension/src/electron-browser/electron-window-service.ts
+++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-window-service.ts
@@ -1,30 +1,34 @@
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 import {
   ConnectionStatus,
   ConnectionStatusService,
 } from '@theia/core/lib/browser/connection-status-service';
-import { ElectronWindowService as TheiaElectronWindowService } from '@theia/core/lib/electron-browser/window/electron-window-service';
-import { SplashService } from '../electron-common/splash-service';
 import { nls } from '@theia/core/lib/common';
+import { ElectronWindowService as TheiaElectronWindowService } from '@theia/core/lib/electron-browser/window/electron-window-service';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import { WindowServiceExt } from '../../../browser/theia/core/window-service-ext';
+import { ElectronMainWindowServiceExt } from '../../../electron-common/electron-main-window-service-ext';
 
 @injectable()
-export class ElectronWindowService extends TheiaElectronWindowService {
+export class ElectronWindowService
+  extends TheiaElectronWindowService
+  implements WindowServiceExt
+{
   @inject(ConnectionStatusService)
-  protected readonly connectionStatusService: ConnectionStatusService;
+  private readonly connectionStatusService: ConnectionStatusService;
 
-  @inject(SplashService)
-  protected readonly splashService: SplashService;
-
-  @inject(FrontendApplicationStateService)
-  protected readonly appStateService: FrontendApplicationStateService;
+  @inject(ElectronMainWindowServiceExt)
+  private readonly mainWindowServiceExt: ElectronMainWindowServiceExt;
 
   @postConstruct()
   protected override init(): void {
-    this.appStateService
-      .reachedAnyState('initialized_layout')
-      .then(() => this.splashService.requestClose());
+    // NOOP
+    // Does not listen on Theia's `window.zoomLevel` changes.
+    // TODO: IDE2 must switch to the Theia preferences and drop the custom one.
   }
 
   protected shouldUnload(): boolean {
@@ -55,4 +59,15 @@ export class ElectronWindowService extends TheiaElectronWindowService {
     });
     return response === 0; // 'Yes', close the window.
   }
+
+  private _firstWindow: boolean | undefined;
+  async isFirstWindow(): Promise<boolean> {
+    if (this._firstWindow === undefined) {
+      const windowId = remote.getCurrentWindow().id; // This is expensive and synchronous so we check it once per FE.
+      this._firstWindow = await this.mainWindowServiceExt.isFirstWindow(
+        windowId
+      );
+    }
+    return this._firstWindow;
+  }
 }
diff --git a/arduino-ide-extension/src/electron-common/electron-main-window-service-ext.ts b/arduino-ide-extension/src/electron-common/electron-main-window-service-ext.ts
new file mode 100644
index 000000000..c0e52d353
--- /dev/null
+++ b/arduino-ide-extension/src/electron-common/electron-main-window-service-ext.ts
@@ -0,0 +1,7 @@
+export const electronMainWindowServiceExtPath = '/services/electron-window-ext';
+export const ElectronMainWindowServiceExt = Symbol(
+  'ElectronMainWindowServiceExt'
+);
+export interface ElectronMainWindowServiceExt {
+  isFirstWindow(windowId: number): Promise<boolean>;
+}
diff --git a/arduino-ide-extension/src/electron-common/splash-service.ts b/arduino-ide-extension/src/electron-common/splash-service.ts
deleted file mode 100644
index d7d4ba6b2..000000000
--- a/arduino-ide-extension/src/electron-common/splash-service.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export const splashServicePath = '/services/splash-service';
-export const SplashService = Symbol('SplashService');
-export interface SplashService {
-  requestClose(): Promise<void>;
-}
diff --git a/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts b/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts
index 7da0c7314..ea25a4e09 100644
--- a/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts
+++ b/arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts
@@ -1,31 +1,26 @@
-import { ContainerModule } from '@theia/core/shared/inversify';
 import { JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging/proxy-factory';
-import { ElectronConnectionHandler } from '@theia/core/lib/electron-common/messaging/electron-connection-handler';
 import { ElectronMainWindowService } from '@theia/core/lib/electron-common/electron-main-window-service';
+import { ElectronConnectionHandler } from '@theia/core/lib/electron-common/messaging/electron-connection-handler';
 import {
   ElectronMainApplication as TheiaElectronMainApplication,
   ElectronMainApplicationContribution,
 } from '@theia/core/lib/electron-main/electron-main-application';
-import {
-  SplashService,
-  splashServicePath,
-} from '../electron-common/splash-service';
-import { SplashServiceImpl } from './splash/splash-service-impl';
-import { ElectronMainApplication } from './theia/electron-main-application';
-import { ElectronMainWindowServiceImpl } from './theia/electron-main-window-service';
+import { TheiaElectronWindow as DefaultTheiaElectronWindow } from '@theia/core/lib/electron-main/theia-electron-window';
+import { ContainerModule } from '@theia/core/shared/inversify';
 import {
   IDEUpdater,
   IDEUpdaterClient,
   IDEUpdaterPath,
 } from '../common/protocol/ide-updater';
+import {
+  ElectronMainWindowServiceExt,
+  electronMainWindowServiceExtPath,
+} from '../electron-common/electron-main-window-service-ext';
+import { ElectronMainWindowServiceExtImpl } from './electron-main-window-service-ext-impl';
 import { IDEUpdaterImpl } from './ide-updater/ide-updater-impl';
+import { ElectronMainApplication } from './theia/electron-main-application';
+import { ElectronMainWindowServiceImpl } from './theia/electron-main-window-service';
 import { TheiaElectronWindow } from './theia/theia-electron-window';
-import { TheiaElectronWindow as DefaultTheiaElectronWindow } from '@theia/core/lib/electron-main/theia-electron-window';
-import { SurveyNotificationServiceImpl } from '../node/survey-service-impl';
-import {
-  SurveyNotificationService,
-  SurveyNotificationServicePath,
-} from '../common/protocol/survey-service';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(ElectronMainApplication).toSelf().inSingletonScope();
@@ -34,17 +29,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(ElectronMainWindowServiceImpl).toSelf().inSingletonScope();
   rebind(ElectronMainWindowService).toService(ElectronMainWindowServiceImpl);
 
-  bind(SplashServiceImpl).toSelf().inSingletonScope();
-  bind(SplashService).toService(SplashServiceImpl);
-  bind(ElectronConnectionHandler)
-    .toDynamicValue(
-      (context) =>
-        new JsonRpcConnectionHandler(splashServicePath, () =>
-          context.container.get(SplashService)
-        )
-    )
-    .inSingletonScope();
-
   // IDE updater bindings
   bind(IDEUpdaterImpl).toSelf().inSingletonScope();
   bind(IDEUpdater).toService(IDEUpdaterImpl);
@@ -67,19 +51,14 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(TheiaElectronWindow).toSelf();
   rebind(DefaultTheiaElectronWindow).toService(TheiaElectronWindow);
 
-  // Survey notification bindings
-  bind(SurveyNotificationServiceImpl).toSelf().inSingletonScope();
-  bind(SurveyNotificationService).toService(SurveyNotificationServiceImpl);
-  bind(ElectronMainApplicationContribution).toService(
-    SurveyNotificationService
-  );
+  bind(ElectronMainWindowServiceExt)
+    .to(ElectronMainWindowServiceExtImpl)
+    .inSingletonScope();
   bind(ElectronConnectionHandler)
     .toDynamicValue(
       (context) =>
-        new JsonRpcConnectionHandler(SurveyNotificationServicePath, () =>
-          context.container.get<SurveyNotificationService>(
-            SurveyNotificationService
-          )
+        new JsonRpcConnectionHandler(electronMainWindowServiceExtPath, () =>
+          context.container.get(ElectronMainWindowServiceExt)
         )
     )
     .inSingletonScope();
diff --git a/arduino-ide-extension/src/electron-main/electron-main-window-service-ext-impl.ts b/arduino-ide-extension/src/electron-main/electron-main-window-service-ext-impl.ts
new file mode 100644
index 000000000..a0c872786
--- /dev/null
+++ b/arduino-ide-extension/src/electron-main/electron-main-window-service-ext-impl.ts
@@ -0,0 +1,15 @@
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ElectronMainWindowServiceExt } from '../electron-common/electron-main-window-service-ext';
+import { ElectronMainApplication } from './theia/electron-main-application';
+
+@injectable()
+export class ElectronMainWindowServiceExtImpl
+  implements ElectronMainWindowServiceExt
+{
+  @inject(ElectronMainApplication)
+  private readonly app: ElectronMainApplication;
+
+  async isFirstWindow(windowId: number): Promise<boolean> {
+    return this.app.firstWindowId === windowId;
+  }
+}
diff --git a/arduino-ide-extension/src/electron-main/splash/splash-screen.ts b/arduino-ide-extension/src/electron-main/splash/splash-screen.ts
deleted file mode 100644
index 2120f5968..000000000
--- a/arduino-ide-extension/src/electron-main/splash/splash-screen.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-MIT License
-
-Copyright (c) 2017 Troy McKinnon
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-// Copied from https://raw.githubusercontent.com/trodi/electron-splashscreen/2f5052a133be021cbf9a438d0ef4719cd1796b75/index.ts
-
-/**
- * Module handles configurable splashscreen to show while app is loading.
- */
-
-import { Event } from '@theia/core/lib/common/event';
-import { BrowserWindow } from 'electron';
-
-/**
- * When splashscreen was shown.
- * @ignore
- */
-let splashScreenTimestamp = 0;
-/**
- * Splashscreen is loaded and ready to show.
- * @ignore
- */
-let splashScreenReady = false;
-/**
- * Main window has been loading for a min amount of time.
- * @ignore
- */
-let slowStartup = false;
-/**
- * True when expected work is complete and we've closed splashscreen, else user prematurely closed splashscreen.
- * @ignore
- */
-let done = false;
-/**
- * Show splashscreen if criteria are met.
- * @ignore
- */
-const showSplash = () => {
-  if (splashScreen && splashScreenReady && slowStartup) {
-    splashScreen.show();
-    splashScreenTimestamp = Date.now();
-  }
-};
-/**
- * Close splashscreen / show main screen. Ensure screen is visible for a min amount of time.
- * @ignore
- */
-const closeSplashScreen = (main: Electron.BrowserWindow, min: number): void => {
-  if (splashScreen) {
-    const timeout = min - (Date.now() - splashScreenTimestamp);
-    setTimeout(() => {
-      done = true;
-      if (splashScreen) {
-        splashScreen.isDestroyed() || splashScreen.close(); // Avoid `Error: Object has been destroyed` (#19)
-        splashScreen = null;
-      }
-      if (!main.isDestroyed()) {
-        main.show();
-      }
-    }, timeout);
-  }
-};
-/** `electron-splashscreen` config object. */
-export interface Config {
-  /** Options for the window that is loading and having a splashscreen tied to. */
-  windowOpts: Electron.BrowserWindowConstructorOptions;
-  /**
-   * URL to the splashscreen template. This is the path to an `HTML` or `SVG` file.
-   * If you want to simply show a `PNG`, wrap it in an `HTML` file.
-   */
-  templateUrl: string;
-
-  /**
-   * Full set of browser window options for the splashscreen. We override key attributes to
-   * make it look & feel like a splashscreen; the rest is up to you!
-   */
-  splashScreenOpts: Electron.BrowserWindowConstructorOptions;
-  /** Number of ms the window will load before splashscreen appears (default: 500ms). */
-  delay?: number;
-  /** Minimum ms the splashscreen will be visible (default: 500ms). */
-  minVisible?: number;
-  /** Close window that is loading if splashscreen is closed by user (default: true). */
-  closeWindow?: boolean;
-}
-/**
- * The actual splashscreen browser window.
- * @ignore
- */
-let splashScreen: Electron.BrowserWindow | null;
-/**
- * Initializes a splashscreen that will show/hide smartly (and handle show/hiding of main window).
- * @param config - Configures splashscreen
- * @returns {BrowserWindow} the main browser window ready for loading
- */
-export const initSplashScreen = async (
-  config: Config,
-  windowFactory: (
-    options: Electron.BrowserViewConstructorOptions
-  ) => Promise<BrowserWindow>,
-  onCloseRequested?: Event<void>
-): Promise<BrowserWindow> => {
-  const xConfig: Required<Config> = {
-    windowOpts: config.windowOpts,
-    templateUrl: config.templateUrl,
-    splashScreenOpts: config.splashScreenOpts,
-    delay: config.delay ?? 500,
-    minVisible: config.minVisible ?? 500,
-    closeWindow: config.closeWindow ?? true,
-  };
-  xConfig.splashScreenOpts.center = true;
-  xConfig.splashScreenOpts.frame = false;
-  xConfig.windowOpts.show = false;
-  const window = await windowFactory(xConfig.windowOpts);
-  splashScreen = new BrowserWindow(xConfig.splashScreenOpts);
-  splashScreen.loadURL(`file://${xConfig.templateUrl}`);
-  xConfig.closeWindow &&
-    splashScreen.on('close', () => {
-      done || window.close();
-    });
-  // Splashscreen is fully loaded and ready to view.
-  splashScreen.webContents.on('did-finish-load', () => {
-    splashScreenReady = true;
-    showSplash();
-  });
-  // Startup is taking enough time to show a splashscreen.
-  setTimeout(() => {
-    slowStartup = true;
-    showSplash();
-  }, xConfig.delay);
-  if (onCloseRequested) {
-    onCloseRequested(() => closeSplashScreen(window, xConfig.minVisible));
-  } else {
-    window.webContents.on('did-finish-load', () => {
-      closeSplashScreen(window, xConfig.minVisible);
-    });
-  }
-  window.on('closed', () => closeSplashScreen(window, 0)); // XXX: close splash when main window is closed
-  return window;
-};
diff --git a/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts b/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts
deleted file mode 100644
index 64168c01b..000000000
--- a/arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { injectable } from '@theia/core/shared/inversify';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { SplashService } from '../../electron-common/splash-service';
-
-@injectable()
-export class SplashServiceImpl implements SplashService {
-  protected requested = false;
-  protected readonly onCloseRequestedEmitter = new Emitter<void>();
-
-  get onCloseRequested(): Event<void> {
-    return this.onCloseRequestedEmitter.event;
-  }
-
-  async requestClose(): Promise<void> {
-    if (!this.requested) {
-      this.requested = true;
-      this.onCloseRequestedEmitter.fire();
-    }
-  }
-}
diff --git a/arduino-ide-extension/src/electron-main/splash/static/splash.html b/arduino-ide-extension/src/electron-main/splash/static/splash.html
deleted file mode 100644
index e372bae3a..000000000
--- a/arduino-ide-extension/src/electron-main/splash/static/splash.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <style>
-        .container {
-            width: auto;
-            text-align: center;
-            padding: 0px;
-        }
-
-        img {
-            max-width: 95%;
-            height: auto;
-        }
-    </style>
-        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-
-<body>
-    <div class="container">
-        <p><img src="splash.png"></p>
-    </div>
-</body>
-
-</html>
diff --git a/arduino-ide-extension/src/electron-main/splash/static/splash.png b/arduino-ide-extension/src/electron-main/splash/static/splash.png
deleted file mode 100644
index 51f0cca4a..000000000
Binary files a/arduino-ide-extension/src/electron-main/splash/static/splash.png and /dev/null differ
diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
index 4a3a3ade2..9c990f0a3 100644
--- a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
+++ b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts
@@ -1,18 +1,15 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { injectable } from '@theia/core/shared/inversify';
 import {
   app,
   BrowserWindow,
-  BrowserWindowConstructorOptions,
   contentTracing,
   ipcMain,
-  screen,
   Event as ElectronEvent,
 } from '@theia/core/electron-shared/electron';
 import { fork } from 'child_process';
 import { AddressInfo } from 'net';
 import { join, dirname } from 'path';
 import * as fs from 'fs-extra';
-import { initSplashScreen } from '../splash/splash-screen';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { ElectronSecurityToken } from '@theia/core/lib/electron-common/electron-token';
 import { FrontendApplicationConfig } from '@theia/application-package/lib/application-props';
@@ -20,7 +17,6 @@ import {
   ElectronMainApplication as TheiaElectronMainApplication,
   ElectronMainExecutionParams,
 } from '@theia/core/lib/electron-main/electron-main-application';
-import { SplashServiceImpl } from '../splash/splash-service-impl';
 import { URI } from '@theia/core/shared/vscode-uri';
 import { Deferred } from '@theia/core/lib/common/promise-util';
 import * as os from '@theia/core/lib/common/os';
@@ -42,14 +38,6 @@ interface WorkspaceOptions {
 
 const WORKSPACES = 'workspaces';
 
-/**
- * Purely a dev thing. If you start the app with the `--nosplash` argument,
- * then you won't have the splash screen (which is always on top :confused:) and can debug the app at startup.
- * Note: if you start the app from VS Code with the `App (Electron)` config, the splash screen will be disabled.
- */
-const APP_STARTED_WITH_NOSPLASH =
-  typeof process !== 'undefined' && process.argv.indexOf('--nosplash') !== -1;
-
 /**
  * If the app is started with `--open-devtools` argument, the `Dev Tools` will be opened.
  */
@@ -66,11 +54,9 @@ const APP_STARTED_WITH_CONTENT_TRACE =
 
 @injectable()
 export class ElectronMainApplication extends TheiaElectronMainApplication {
-  protected startup = false;
-  protected openFilePromise = new Deferred();
-
-  @inject(SplashServiceImpl)
-  protected readonly splashService: SplashServiceImpl;
+  private startup = false;
+  private _firstWindowId: number | undefined;
+  private openFilePromise = new Deferred();
 
   override async start(config: FrontendApplicationConfig): Promise<void> {
     // Explicitly set the app name to have better menu items on macOS. ("About", "Hide", and "Quit")
@@ -142,7 +128,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     })();
   }
 
-  attachFileAssociations() {
+  private attachFileAssociations(): void {
     // OSX: register open-file event
     if (os.isOSX) {
       app.on('open-file', async (event, uri) => {
@@ -158,7 +144,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     }
   }
 
-  protected async isValidSketchPath(uri: string): Promise<boolean | undefined> {
+  private async isValidSketchPath(uri: string): Promise<boolean | undefined> {
     return typeof uri === 'string' && (await fs.pathExists(uri));
   }
 
@@ -201,7 +187,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     }
   }
 
-  protected async launchFromArgs(
+  private async launchFromArgs(
     params: ElectronMainExecutionParams
   ): Promise<boolean> {
     // Copy to prevent manipulation of original array
@@ -223,7 +209,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     return false;
   }
 
-  protected async openSketch(
+  private async openSketch(
     workspace: WorkspaceOptions | string
   ): Promise<BrowserWindow> {
     const options = await this.getLastWindowOptions();
@@ -257,7 +243,8 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
   }
 
   protected override getTitleBarStyle(
-    config: FrontendApplicationConfig
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _config: FrontendApplicationConfig
   ): 'native' | 'custom' {
     return 'native';
   }
@@ -287,73 +274,17 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     super.onSecondInstance(event, argv, cwd);
   }
 
-  /**
-   * Use this rather than creating `BrowserWindow` instances from scratch, since some security parameters need to be set, this method will do it.
-   *
-   * @param options
-   */
   override async createWindow(
     asyncOptions: MaybePromise<TheiaBrowserWindowOptions> = this.getDefaultTheiaWindowOptions()
   ): Promise<BrowserWindow> {
-    let options = await asyncOptions;
-    options = this.avoidOverlap(options);
-    let electronWindow: BrowserWindow | undefined;
-    if (this.windows.size || APP_STARTED_WITH_NOSPLASH) {
-      electronWindow = await this.doCreateWindow(options);
-    } else {
-      const { bounds } = screen.getDisplayNearestPoint(
-        screen.getCursorScreenPoint()
-      );
-      const splashHeight = 450;
-      const splashWidth = 600;
-      const splashY = Math.floor(bounds.y + (bounds.height - splashHeight) / 2);
-      const splashX = Math.floor(bounds.x + (bounds.width - splashWidth) / 2);
-      const splashScreenOpts: BrowserWindowConstructorOptions = {
-        height: splashHeight,
-        width: splashWidth,
-        x: splashX,
-        y: splashY,
-        transparent: true,
-        alwaysOnTop: true,
-        focusable: false,
-        minimizable: false,
-        maximizable: false,
-        hasShadow: false,
-        resizable: false,
-      };
-      electronWindow = await initSplashScreen(
-        {
-          windowOpts: options,
-          templateUrl: join(
-            __dirname,
-            '..',
-            '..',
-            '..',
-            'src',
-            'electron-main',
-            'splash',
-            'static',
-            'splash.html'
-          ),
-          delay: 0,
-          minVisible: 2000,
-          splashScreenOpts,
-        },
-        (windowOptions) => this.doCreateWindow(windowOptions),
-        this.splashService.onCloseRequested
-      );
-    }
-    return electronWindow;
-  }
-
-  private async doCreateWindow(
-    options: TheiaBrowserWindowOptions
-  ): Promise<BrowserWindow> {
-    const electronWindow = await super.createWindow(options);
+    const electronWindow = await super.createWindow(asyncOptions);
     if (APP_STARTED_WITH_DEV_TOOLS) {
       electronWindow.webContents.openDevTools();
     }
     this.attachListenersToWindow(electronWindow);
+    if (this._firstWindowId === undefined) {
+      this._firstWindowId = electronWindow.id;
+    }
     return electronWindow;
   }
 
@@ -389,7 +320,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
           });
           event.newGuest = new BrowserWindow(options);
           event.newGuest.setMenu(null);
-          event.newGuest?.on('closed', (e: any) => {
+          event.newGuest?.on('closed', () => {
             electronWindow?.webContents.send('CLOSE_CHILD_WINDOW');
           });
           event.newGuest?.loadURL(url);
@@ -462,9 +393,9 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
     }
   }
 
-  protected closedWorkspaces: WorkspaceOptions[] = [];
+  private closedWorkspaces: WorkspaceOptions[] = [];
 
-  protected attachClosedWorkspace(window: BrowserWindow): void {
+  private attachClosedWorkspace(window: BrowserWindow): void {
     // Since the `before-quit` event is only fired when closing the *last* window
     // We need to keep track of recently closed windows/workspaces manually
     window.on('close', () => {
@@ -522,4 +453,8 @@ export class ElectronMainApplication extends TheiaElectronMainApplication {
   get browserWindows(): BrowserWindow[] {
     return Array.from(this.windows.values()).map(({ window }) => window);
   }
+
+  get firstWindowId(): number | undefined {
+    return this._firstWindowId;
+  }
 }
diff --git a/arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts b/arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts
index d693ce758..a14f406d1 100644
--- a/arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts
+++ b/arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts
@@ -76,7 +76,7 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
       fqbn: firmware.board_fqbn,
     };
     try {
-      await this.monitorManager.notifyUploadStarted(board, port);
+      await this.monitorManager.notifyUploadStarted(board.fqbn, port);
       output = await this.runCommand([
         'firmware',
         'flash',
@@ -90,7 +90,7 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
     } catch (e) {
       throw e;
     } finally {
-      await this.monitorManager.notifyUploadFinished(board, port);
+      await this.monitorManager.notifyUploadFinished(board.fqbn, port);
       return output;
     }
   }
diff --git a/arduino-ide-extension/src/node/arduino-ide-backend-module.ts b/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
index 6338b5320..b21f5d301 100644
--- a/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
+++ b/arduino-ide-extension/src/node/arduino-ide-backend-module.ts
@@ -104,6 +104,11 @@ import { ClangFormatter } from './clang-formatter';
 import { FormatterPath } from '../common/protocol/formatter';
 import { LocalizationBackendContribution } from './i18n/localization-backend-contribution';
 import { LocalizationBackendContribution as TheiaLocalizationBackendContribution } from '@theia/core/lib/node/i18n/localization-backend-contribution';
+import { SurveyNotificationServiceImpl } from './survey-service-impl';
+import {
+  SurveyNotificationService,
+  SurveyNotificationServicePath,
+} from '../common/protocol/survey-service';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(BackendApplication).toSelf().inSingletonScope();
@@ -401,4 +406,17 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaLocalizationBackendContribution).toService(
     LocalizationBackendContribution
   );
+
+  // Survey notification bindings
+  // It's currently unused. https://github.com/arduino/arduino-ide/pull/1150
+  bind(SurveyNotificationServiceImpl).toSelf().inSingletonScope();
+  bind(SurveyNotificationService).toService(SurveyNotificationServiceImpl);
+  bind(ConnectionHandler)
+    .toDynamicValue(
+      ({ container }) =>
+        new JsonRpcConnectionHandler(SurveyNotificationServicePath, () =>
+          container.get<SurveyNotificationService>(SurveyNotificationService)
+        )
+    )
+    .inSingletonScope();
 });
diff --git a/arduino-ide-extension/src/node/clang-formatter.ts b/arduino-ide-extension/src/node/clang-formatter.ts
index b34b034ac..2431d96d6 100644
--- a/arduino-ide-extension/src/node/clang-formatter.ts
+++ b/arduino-ide-extension/src/node/clang-formatter.ts
@@ -1,3 +1,4 @@
+import * as os from 'os';
 import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { FileUri } from '@theia/core/lib/node/file-uri';
@@ -121,25 +122,39 @@ function toClangOptions(
   return { UseTab: 'Never', TabWidth: 2 };
 }
 
-// See: https://releases.llvm.org/11.0.1/tools/clang/docs/ClangFormatStyleOptions.html
 export function style({ TabWidth, UseTab }: ClangFormatOptions): string {
-  return JSON.stringify(styleJson({ TabWidth, UseTab })).replace(/\"/g, '\\"');
+  let styleArgument = JSON.stringify(styleJson({ TabWidth, UseTab })).replace(
+    /[\\"]/g,
+    '\\$&'
+  );
+  if (os.platform() === 'win32') {
+    // Windows command interpreter does not use backslash escapes. This causes the argument to have alternate quoted and
+    // unquoted sections.
+    // Special characters in the unquoted sections must be caret escaped.
+    const styleArgumentSplit = styleArgument.split('"');
+    for (let i = 1; i < styleArgumentSplit.length; i += 2) {
+      styleArgumentSplit[i] = styleArgumentSplit[i].replace(/[<>^|]/g, '^$&');
+    }
+
+    styleArgument = styleArgumentSplit.join('"');
+  }
+
+  return styleArgument;
 }
 
 function styleJson({
   TabWidth,
   UseTab,
 }: ClangFormatOptions): Record<string, unknown> {
+  // Source: https://github.com/arduino/tooling-project-assets/tree/main/other/clang-format-configuration
   return {
-    Language: 'Cpp',
-    // # LLVM is the default style setting, used when a configuration option is not set here
-    BasedOnStyle: 'LLVM',
     AccessModifierOffset: -2,
     AlignAfterOpenBracket: 'Align',
-    AlignConsecutiveAssignments: false,
-    AlignConsecutiveBitFields: false,
-    AlignConsecutiveDeclarations: false,
-    AlignConsecutiveMacros: false,
+    AlignArrayOfStructures: 'None',
+    AlignConsecutiveAssignments: 'None',
+    AlignConsecutiveBitFields: 'None',
+    AlignConsecutiveDeclarations: 'None',
+    AlignConsecutiveMacros: 'None',
     AlignEscapedNewlines: 'DontAlign',
     AlignOperands: 'Align',
     AlignTrailingComments: true,
@@ -150,16 +165,18 @@ function styleJson({
     AllowShortCaseLabelsOnASingleLine: true,
     AllowShortEnumsOnASingleLine: true,
     AllowShortFunctionsOnASingleLine: 'Empty',
-    AllowShortIfStatementsOnASingleLine: 'Always',
+    AllowShortIfStatementsOnASingleLine: 'AllIfsAndElse',
     AllowShortLambdasOnASingleLine: 'Empty',
     AllowShortLoopsOnASingleLine: true,
     AlwaysBreakAfterDefinitionReturnType: 'None',
     AlwaysBreakAfterReturnType: 'None',
     AlwaysBreakBeforeMultilineStrings: false,
     AlwaysBreakTemplateDeclarations: 'No',
+    AttributeMacros: ['__capability'],
+    BasedOnStyle: 'LLVM',
     BinPackArguments: true,
     BinPackParameters: true,
-    // # Only used when "BreakBeforeBraces" set to "Custom"
+    BitFieldColonSpacing: 'Both',
     BraceWrapping: {
       AfterCaseLabel: false,
       AfterClass: false,
@@ -167,7 +184,7 @@ function styleJson({
       AfterEnum: false,
       AfterFunction: false,
       AfterNamespace: false,
-      // #AfterObjCDeclaration:
+      AfterObjCDeclaration: false,
       AfterStruct: false,
       AfterUnion: false,
       AfterExternBlock: false,
@@ -176,104 +193,143 @@ function styleJson({
       BeforeLambdaBody: false,
       BeforeWhile: false,
       IndentBraces: false,
-      SplitEmptyFunction: false,
-      SplitEmptyRecord: false,
-      SplitEmptyNamespace: false,
+      SplitEmptyFunction: true,
+      SplitEmptyRecord: true,
+      SplitEmptyNamespace: true,
     },
-    // # Java-specific
-    // #BreakAfterJavaFieldAnnotations:
+    BreakAfterJavaFieldAnnotations: false,
     BreakBeforeBinaryOperators: 'NonAssignment',
     BreakBeforeBraces: 'Attach',
+    BreakBeforeConceptDeclarations: false,
+    BreakBeforeInheritanceComma: false,
     BreakBeforeTernaryOperators: true,
     BreakConstructorInitializers: 'BeforeColon',
+    BreakConstructorInitializersBeforeComma: false,
     BreakInheritanceList: 'BeforeColon',
     BreakStringLiterals: false,
     ColumnLimit: 0,
-    // # "" matches none
     CommentPragmas: '',
     CompactNamespaces: false,
-    ConstructorInitializerAllOnOneLineOrOnePerLine: true,
+    ConstructorInitializerAllOnOneLineOrOnePerLine: false,
     ConstructorInitializerIndentWidth: 2,
     ContinuationIndentWidth: 2,
     Cpp11BracedListStyle: false,
     DeriveLineEnding: true,
     DerivePointerAlignment: true,
     DisableFormat: false,
-    // # Docs say "Do not use this in config files". The default (LLVM 11.0.1) is "false".
-    // #ExperimentalAutoDetectBinPacking:
+    EmptyLineAfterAccessModifier: 'Leave',
+    EmptyLineBeforeAccessModifier: 'Leave',
+    ExperimentalAutoDetectBinPacking: false,
     FixNamespaceComments: false,
-    ForEachMacros: [],
+    ForEachMacros: ['foreach', 'Q_FOREACH', 'BOOST_FOREACH'],
+    IfMacros: ['KJ_IF_MAYBE'],
     IncludeBlocks: 'Preserve',
-    IncludeCategories: [],
-    // # "" matches none
+    IncludeCategories: [
+      {
+        Regex: '^"(llvm|llvm-c|clang|clang-c)/',
+        Priority: 2,
+        SortPriority: 0,
+        CaseSensitive: false,
+      },
+      {
+        Regex: '^(<|"(gtest|gmock|isl|json)/)',
+        Priority: 3,
+        SortPriority: 0,
+        CaseSensitive: false,
+      },
+      { Regex: '.*', Priority: 1, SortPriority: 0, CaseSensitive: false },
+    ],
     IncludeIsMainRegex: '',
     IncludeIsMainSourceRegex: '',
+    IndentAccessModifiers: false,
     IndentCaseBlocks: true,
     IndentCaseLabels: true,
     IndentExternBlock: 'Indent',
     IndentGotoLabels: false,
     IndentPPDirectives: 'None',
+    IndentRequires: true,
     IndentWidth: 2,
     IndentWrappedFunctionNames: false,
     InsertTrailingCommas: 'None',
-    // # Java-specific
-    // #JavaImportGroups:
-    // # JavaScript-specific
-    // #JavaScriptQuotes:
-    // #JavaScriptWrapImports
+    JavaScriptQuotes: 'Leave',
+    JavaScriptWrapImports: true,
     KeepEmptyLinesAtTheStartOfBlocks: true,
+    LambdaBodyIndentation: 'Signature',
+    Language: 'Cpp',
     MacroBlockBegin: '',
     MacroBlockEnd: '',
-    // # Set to a large number to effectively disable
     MaxEmptyLinesToKeep: 100000,
     NamespaceIndentation: 'None',
-    NamespaceMacros: [],
-    // # Objective C-specific
-    // #ObjCBinPackProtocolList:
-    // #ObjCBlockIndentWidth:
-    // #ObjCBreakBeforeNestedBlockParam:
-    // #ObjCSpaceAfterProperty:
-    // #ObjCSpaceBeforeProtocolList
+    ObjCBinPackProtocolList: 'Auto',
+    ObjCBlockIndentWidth: 2,
+    ObjCBreakBeforeNestedBlockParam: true,
+    ObjCSpaceAfterProperty: false,
+    ObjCSpaceBeforeProtocolList: true,
+    PPIndentWidth: -1,
+    PackConstructorInitializers: 'BinPack',
     PenaltyBreakAssignment: 1,
     PenaltyBreakBeforeFirstCallParameter: 1,
     PenaltyBreakComment: 1,
     PenaltyBreakFirstLessLess: 1,
+    PenaltyBreakOpenParenthesis: 1,
     PenaltyBreakString: 1,
     PenaltyBreakTemplateDeclaration: 1,
     PenaltyExcessCharacter: 1,
+    PenaltyIndentedWhitespace: 1,
     PenaltyReturnTypeOnItsOwnLine: 1,
-    // # Used as a fallback if alignment style can't be detected from code (DerivePointerAlignment: true)
     PointerAlignment: 'Right',
-    RawStringFormats: [],
+    QualifierAlignment: 'Leave',
+    ReferenceAlignment: 'Pointer',
     ReflowComments: false,
-    SortIncludes: false,
+    RemoveBracesLLVM: false,
+    SeparateDefinitionBlocks: 'Leave',
+    ShortNamespaceLines: 0,
+    SortIncludes: 'Never',
+    SortJavaStaticImport: 'Before',
     SortUsingDeclarations: false,
     SpaceAfterCStyleCast: false,
     SpaceAfterLogicalNot: false,
     SpaceAfterTemplateKeyword: false,
+    SpaceAroundPointerQualifiers: 'Default',
     SpaceBeforeAssignmentOperators: true,
+    SpaceBeforeCaseColon: false,
     SpaceBeforeCpp11BracedList: false,
     SpaceBeforeCtorInitializerColon: true,
     SpaceBeforeInheritanceColon: true,
     SpaceBeforeParens: 'ControlStatements',
+    SpaceBeforeParensOptions: {
+      AfterControlStatements: true,
+      AfterForeachMacros: true,
+      AfterFunctionDefinitionName: false,
+      AfterFunctionDeclarationName: false,
+      AfterIfMacros: true,
+      AfterOverloadedOperator: false,
+      BeforeNonEmptyParentheses: false,
+    },
     SpaceBeforeRangeBasedForLoopColon: true,
     SpaceBeforeSquareBrackets: false,
     SpaceInEmptyBlock: false,
     SpaceInEmptyParentheses: false,
     SpacesBeforeTrailingComments: 2,
-    SpacesInAngles: false,
+    SpacesInAngles: 'Leave',
     SpacesInCStyleCastParentheses: false,
     SpacesInConditionalStatement: false,
     SpacesInContainerLiterals: false,
+    SpacesInLineCommentPrefix: { Minimum: 0, Maximum: -1 },
     SpacesInParentheses: false,
     SpacesInSquareBrackets: false,
     Standard: 'Auto',
-    StatementMacros: [],
+    StatementAttributeLikeMacros: ['Q_EMIT'],
+    StatementMacros: ['Q_UNUSED', 'QT_REQUIRE_VERSION'],
     TabWidth,
-    TypenameMacros: [],
-    // # Default to LF if line endings can't be detected from the content (DeriveLineEnding).
     UseCRLF: false,
     UseTab,
-    WhitespaceSensitiveMacros: [],
+    WhitespaceSensitiveMacros: [
+      'STRINGIZE',
+      'PP_STRINGIZE',
+      'BOOST_PP_STRINGIZE',
+      'NS_SWIFT_NAME',
+      'CF_SWIFT_NAME',
+    ],
   };
 }
diff --git a/arduino-ide-extension/src/node/core-service-impl.ts b/arduino-ide-extension/src/node/core-service-impl.ts
index 7072a34dc..a7dde4f2b 100644
--- a/arduino-ide-extension/src/node/core-service-impl.ts
+++ b/arduino-ide-extension/src/node/core-service-impl.ts
@@ -23,7 +23,7 @@ import {
   UploadUsingProgrammerResponse,
 } from './cli-protocol/cc/arduino/cli/commands/v1/upload_pb';
 import { ResponseService } from '../common/protocol/response-service';
-import { Board, OutputMessage, Port, Status } from '../common/protocol';
+import { OutputMessage, Port, Status } from '../common/protocol';
 import { ArduinoCoreServiceClient } from './cli-protocol/cc/arduino/cli/commands/v1/commands_grpc_pb';
 import { Port as GrpcPort } from './cli-protocol/cc/arduino/cli/commands/v1/port_pb';
 import { ApplicationError, CommandService, Disposable, nls } from '@theia/core';
@@ -376,23 +376,23 @@ export class CoreServiceImpl extends CoreClientAware implements CoreService {
   }
 
   private async notifyUploadWillStart({
-    board,
+    fqbn,
     port,
   }: {
-    board?: Board | undefined;
+    fqbn?: string | undefined;
     port?: Port | undefined;
   }): Promise<void> {
-    return this.monitorManager.notifyUploadStarted(board, port);
+    return this.monitorManager.notifyUploadStarted(fqbn, port);
   }
 
   private async notifyUploadDidFinish({
-    board,
+    fqbn,
     port,
   }: {
-    board?: Board | undefined;
+    fqbn?: string | undefined;
     port?: Port | undefined;
   }): Promise<Status> {
-    return this.monitorManager.notifyUploadFinished(board, port);
+    return this.monitorManager.notifyUploadFinished(fqbn, port);
   }
 
   private mergeSourceOverrides(
diff --git a/arduino-ide-extension/src/node/monitor-manager.ts b/arduino-ide-extension/src/node/monitor-manager.ts
index a671a14c4..38360a39f 100644
--- a/arduino-ide-extension/src/node/monitor-manager.ts
+++ b/arduino-ide-extension/src/node/monitor-manager.ts
@@ -58,7 +58,7 @@ export class MonitorManager extends CoreClientAware {
    * combination specified, false in all other cases.
    */
   isStarted(board: Board, port: Port): boolean {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     const monitor = this.monitorServices.get(monitorID);
     if (monitor) {
       return monitor.isStarted();
@@ -106,7 +106,7 @@ export class MonitorManager extends CoreClientAware {
     port: Port,
     connectToClient: (status: Status) => void
   ): Promise<void> {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
 
     let monitor = this.monitorServices.get(monitorID);
     if (!monitor) {
@@ -138,7 +138,7 @@ export class MonitorManager extends CoreClientAware {
    * @param port port monitored
    */
   async stopMonitor(board: Board, port: Port): Promise<void> {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     const monitor = this.monitorServices.get(monitorID);
     if (!monitor) {
       // There's no monitor to stop, bail
@@ -155,7 +155,7 @@ export class MonitorManager extends CoreClientAware {
    * @returns port of the MonitorService's WebSocket
    */
   getWebsocketAddressPort(board: Board, port: Port): number {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     const monitor = this.monitorServices.get(monitorID);
     if (!monitor) {
       return -1;
@@ -168,17 +168,17 @@ export class MonitorManager extends CoreClientAware {
    * that an upload process started on that exact board/port combination.
    * This must be done so that we can stop the monitor for the time being
    * until the upload process finished.
-   * @param board board connected to port
+   * @param fqbn the FQBN of the board connected to port
    * @param port port to monitor
    */
-  async notifyUploadStarted(board?: Board, port?: Port): Promise<void> {
-    if (!board || !port) {
+  async notifyUploadStarted(fqbn?: string, port?: Port): Promise<void> {
+    if (!fqbn || !port) {
       // We have no way of knowing which monitor
       // to retrieve if we don't have this information.
       return;
     }
 
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(fqbn, port);
     this.addToMonitorIDsByUploadState('uploadInProgress', monitorID);
 
     const monitor = this.monitorServices.get(monitorID);
@@ -194,19 +194,22 @@ export class MonitorManager extends CoreClientAware {
   /**
    * Notifies the monitor service of that board/port combination
    * that an upload process started on that exact board/port combination.
-   * @param board board connected to port
+   * @param fqbn the FQBN of the board connected to port
    * @param port port to monitor
    * @returns a Status object to know if the process has been
    * started or if there have been errors.
    */
-  async notifyUploadFinished(board?: Board, port?: Port): Promise<Status> {
+  async notifyUploadFinished(
+    fqbn?: string | undefined,
+    port?: Port
+  ): Promise<Status> {
     let status: Status = Status.NOT_CONNECTED;
     let portDidChangeOnUpload = false;
 
     // We have no way of knowing which monitor
     // to retrieve if we don't have this information.
-    if (board && port) {
-      const monitorID = this.monitorID(board, port);
+    if (fqbn && port) {
+      const monitorID = this.monitorID(fqbn, port);
       this.removeFromMonitorIDsByUploadState('uploadInProgress', monitorID);
 
       const monitor = this.monitorServices.get(monitorID);
@@ -277,7 +280,7 @@ export class MonitorManager extends CoreClientAware {
     port: Port,
     settings: PluggableMonitorSettings
   ) {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     let monitor = this.monitorServices.get(monitorID);
     if (!monitor) {
       monitor = this.createMonitor(board, port);
@@ -296,7 +299,7 @@ export class MonitorManager extends CoreClientAware {
     board: Board,
     port: Port
   ): Promise<MonitorSettings> {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     const monitor = this.monitorServices.get(monitorID);
     if (!monitor) {
       return {};
@@ -312,7 +315,7 @@ export class MonitorManager extends CoreClientAware {
    * @returns a new instance of MonitorService ready to use.
    */
   private createMonitor(board: Board, port: Port): MonitorService {
-    const monitorID = this.monitorID(board, port);
+    const monitorID = this.monitorID(board.fqbn, port);
     const monitor = this.monitorServiceFactory({
       board,
       port,
@@ -341,12 +344,12 @@ export class MonitorManager extends CoreClientAware {
 
   /**
    * Utility function to create a unique ID for a monitor service.
-   * @param board
+   * @param fqbn
    * @param port
    * @returns a unique monitor ID
    */
-  private monitorID(board: Board, port: Port): MonitorID {
-    const splitFqbn = board?.fqbn?.split(':') || [];
+  private monitorID(fqbn: string | undefined, port: Port): MonitorID {
+    const splitFqbn = fqbn?.split(':') || [];
     const shortenedFqbn = splitFqbn.slice(0, 3).join(':') || '';
     return `${shortenedFqbn}-${port.address}-${port.protocol}`;
   }
diff --git a/browser-app/package.json b/browser-app/package.json
index 30ab3cd86..cefa373f7 100644
--- a/browser-app/package.json
+++ b/browser-app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "browser-app",
-  "version": "2.0.0-rc9.1",
+  "version": "2.0.0-rc9.2",
   "license": "AGPL-3.0-or-later",
   "dependencies": {
     "@theia/core": "1.25.0",
@@ -19,7 +19,7 @@
     "@theia/process": "1.25.0",
     "@theia/terminal": "1.25.0",
     "@theia/workspace": "1.25.0",
-    "arduino-ide-extension": "2.0.0-rc9.1"
+    "arduino-ide-extension": "2.0.0-rc9.2"
   },
   "devDependencies": {
     "@theia/cli": "1.25.0"
diff --git a/electron-app/package.json b/electron-app/package.json
index 26ff29316..99a12d99e 100644
--- a/electron-app/package.json
+++ b/electron-app/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "electron-app",
-  "version": "2.0.0-rc9.1",
+  "version": "2.0.0-rc9.2",
   "license": "AGPL-3.0-or-later",
   "main": "src-gen/frontend/electron-main.js",
   "dependencies": {
@@ -21,7 +21,7 @@
     "@theia/process": "1.25.0",
     "@theia/terminal": "1.25.0",
     "@theia/workspace": "1.25.0",
-    "arduino-ide-extension": "2.0.0-rc9.1"
+    "arduino-ide-extension": "2.0.0-rc9.2"
   },
   "devDependencies": {
     "@theia/cli": "1.25.0",
@@ -61,7 +61,7 @@
     },
     "generator": {
       "config": {
-        "preloadTemplate": "<div class='theia-preload' style='background-color: rgb(237, 241, 242);'></div>"
+        "preloadTemplate": "./resources/preload.html"
       }
     }
   }
diff --git a/electron-app/resources/preload.html b/electron-app/resources/preload.html
new file mode 100644
index 000000000..9843ac97d
--- /dev/null
+++ b/electron-app/resources/preload.html
@@ -0,0 +1,114 @@
+<head>
+    <style>
+        /* The colors are hard-coded and based on the `editor.background` and `editor.foreground` values from `./arduino-ide-extension/src/browser/data/default.color-theme.json` */
+        @media (prefers-color-scheme: light) {
+            html {
+                background: #ffffff;
+            }
+        }
+
+        /* The colors are hard-coded and based on the `editor.background` and `editor.foreground` values from `./arduino-ide-extension/src/browser/data/dark.color-theme.json` */
+        @media (prefers-color-scheme: dark) {
+            html {
+                background: #1f272a;
+            }
+        }
+
+        .theia-preload {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
+            /* Above styles copied from https://github.com/eclipse-theia/theia/blob/5aeef6c0c683b4e91713ab736957e6655b486adc/packages/core/src/browser/style/index.css#L147-L161 */
+            /* Otherwise, there is a flickering when Theia's CSS loads. */
+
+            background-image: none;
+        }
+
+        .theia-preload::after {
+            /* remove default loading animation */
+            content: none;
+        }
+
+        .spinner-container {
+            display: flex;
+            flex-direction: center;
+            align-self: center;
+            justify-content: center;
+            height: 100vh;
+            width: 100vw;
+        }
+
+        .custom-spinner {
+            align-self: center;
+        }
+
+        .custom-spinner svg {
+            width: 16vw;
+            height: 16vh;
+            animation-delay: 0;
+            animation-duration: 2s;
+            animation-iteration-count: infinite;
+            animation-name: preload-spinner;
+            animation-timing-function: ease;
+        }
+
+        @keyframes preload-spinner {
+            0% {
+                transform: scale(1.0);
+            }
+
+            50% {
+                transform: scale(0.8);
+            }
+
+            100% {
+                transform: scale(1.0);
+            }
+        }
+    </style>
+        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+
+<body>
+    <div class='spinner-container'>
+        <div class='custom-spinner'>
+            <svg id="spinner" xmlns="http://www.w3.org/2000/svg" width="2499" height="2500"
+                viewBox="0 0 1372.201 1372.684">
+                <path fill="#00979D" stroke="#81C9CB" stroke-width=".932" stroke-miterlimit="10"
+                    d="M1371.701 686.024c0 378.658-306.972 685.605-685.549 685.605C307.451 1371.629.5 1064.682.5 686.024.5 307.455 307.451.483 686.152.483c378.594.001 685.549 306.972 685.549 685.541z" />
+                <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="-16.3" y1="16.071" x2="1354.901" y2="16.071"
+                    gradientTransform="matrix(1 0 0 -1 16.8 702.696)">
+                    <stop offset=".117" stop-color="#fff" stop-opacity="0" />
+                    <stop offset=".252" stop-color="#c0d1d3" stop-opacity=".153" />
+                    <stop offset=".387" stop-color="#91b3b7" stop-opacity=".306" />
+                    <stop offset=".52" stop-color="#6d9fa3" stop-opacity=".457" />
+                    <stop offset=".65" stop-color="#4d9195" stop-opacity=".604" />
+                    <stop offset=".776" stop-color="#30888b" stop-opacity=".746" />
+                    <stop offset=".895" stop-color="#148386" stop-opacity=".881" />
+                    <stop offset="1" stop-color="#008184" />
+                </linearGradient>
+                <linearGradient id="b" gradientUnits="userSpaceOnUse" x1="-16.8" y1="16.071" x2="1355.401" y2="16.071"
+                    gradientTransform="matrix(1 0 0 -1 16.8 702.696)">
+                    <stop offset="0" stop-color="#fff" stop-opacity="0" />
+                    <stop offset=".153" stop-color="#c0d1d3" stop-opacity=".153" />
+                    <stop offset=".306" stop-color="#91b3b7" stop-opacity=".306" />
+                    <stop offset=".457" stop-color="#6d9fa3" stop-opacity=".457" />
+                    <stop offset=".604" stop-color="#4d9195" stop-opacity=".604" />
+                    <stop offset=".746" stop-color="#30888b" stop-opacity=".746" />
+                    <stop offset=".881" stop-color="#148386" stop-opacity=".881" />
+                    <stop offset="1" stop-color="#008184" />
+                </linearGradient>
+                <path opacity=".5" fill="url(#a)" stroke="url(#b)" stroke-miterlimit="10"
+                    d="M1371.701 686.595c0 378.65-306.972 685.606-685.549 685.606C307.451 1372.201.5 1065.23.5 686.595.5 308.019 307.451 1.048 686.152 1.048c378.594.016 685.549 306.97 685.549 685.547z" />
+                <g fill="#FFF">
+                    <path
+                        d="M947.959 931.196c-12.909 0-26.127-.929-39.127-2.864-108.978-15.554-181.848-93.822-222.665-153.989-40.946 60.166-113.811 138.512-222.74 154.045a275.864 275.864 0 0 1-39.133 2.785c-67.753 0-131.358-25.217-179.201-71.003-48.299-46.165-74.951-108.114-74.951-174.171 0-66.14 26.651-128.004 75.021-174.253 47.797-45.793 111.449-70.936 179.231-70.936 12.918 0 26.067.928 39.023 2.783 108.932 15.535 181.794 93.813 222.743 153.99 40.825-60.177 113.689-138.432 222.658-153.99 13-1.863 26.148-2.783 39.066-2.783 67.753 0 131.401 25.208 179.197 70.936 48.345 46.249 74.937 108.113 74.937 174.253 0 66.057-26.524 128.006-74.868 174.171-47.881 45.785-111.434 71.026-179.191 71.026M734.42 686.024c21.283 40.534 84.067 141.676 186.692 156.375 8.984 1.236 18.028 1.923 26.839 1.923 92.185 0 167.225-71.002 167.225-158.322s-75.023-158.321-167.291-158.321c-8.812 0-17.853.629-26.753 1.921-102.644 14.664-165.428 115.806-186.712 156.424M424.393 527.702c-92.308 0-167.36 70.998-167.36 158.321 0 87.305 75.021 158.322 167.245 158.322 8.852 0 17.897-.688 26.879-1.922 102.629-14.697 165.394-115.783 186.689-156.375-21.237-40.535-84.061-141.761-186.689-156.376-8.877-1.341-17.945-1.97-26.764-1.97" />
+                    <path
+                        d="M354.37 662.051h152.625v49.181H354.37zM1016.484 662.051h-51.671v-51.747h-49.348v51.747h-51.648v49.181h51.648v51.737h49.348v-51.737h51.671z" />
+                </g>
+            </svg>
+        </div>
+    </div>
+</body>
diff --git a/electron/.gitignore b/electron/.gitignore
index 9f6844f02..c18304ae5 100644
--- a/electron/.gitignore
+++ b/electron/.gitignore
@@ -15,4 +15,8 @@ dist/
 electron-builder.env
 
 # The generated `package.json` under the `build` folder.
-build/package.json
\ No newline at end of file
+build/package.json
+
+# Resources the packager copies from dev to prod
+build/resources/preload.html
+build/patch/frontend/index.js
diff --git a/electron/build/patch/backend/main.js b/electron/build/patch/backend/main.js
index b15d72e40..cb138d3c4 100644
--- a/electron/build/patch/backend/main.js
+++ b/electron/build/patch/backend/main.js
@@ -1,4 +1,18 @@
 // @ts-check
+
+// Patch for on Linux when `XDG_CONFIG_HOME` is not available, `node-log-rotate` creates the folder with `undefined` name.
+// See https://github.com/lemon-sour/node-log-rotate/issues/23 and https://github.com/arduino/arduino-ide/issues/394.
+// If the IDE2 is running on Linux, and the `XDG_CONFIG_HOME` variable is not available, set it to avoid the `undefined` folder.
+// From the specs: https://specifications.freedesktop.org/basedir-spec/latest/ar01s03.html
+// "If $XDG_CONFIG_HOME is either not set or empty, a default equal to $HOME/.config should be used."
+const os = require('os');
+if (os.platform() === 'linux' && !process.env['XDG_CONFIG_HOME']) {
+    const { join } = require('path');
+    const home = process.env['HOME'];
+    const xdgConfigHome = home ? join(home, '.config') : join(os.homedir(), '.config');
+    process.env['XDG_CONFIG_HOME'] = xdgConfigHome;
+}
+
 const { setup, log } = require('node-log-rotate');
 setup({
     appName: 'Arduino IDE',
diff --git a/electron/build/patch/frontend/index.js b/electron/build/patch/frontend/index.js
deleted file mode 100644
index 26afbfedd..000000000
--- a/electron/build/patch/frontend/index.js
+++ /dev/null
@@ -1,100 +0,0 @@
-// Patch for the startup theme. Customizes the `ThemeService.get().defaultTheme();` to dispatch the default IDE2 theme based on the OS' theme.
-// For all subsequent starts of the IDE the theme applied will be the last one set by the user.
-
-// With the current version of Theia adopted (1.25) it is not possible to extend the `ThemeService`, it will be possible starting from Theia 1.27.
-// Once the version of Theia is updated, this patch will be removed and this functionality will be implemented via dependency injection.
-// Ideally, we should open a PR in Theia and add support for `light` and `dark` default themes in the app config.
-
-const {
-  ThemeService,
-  ThemeServiceSymbol,
-  BuiltinThemeProvider,
-} = require('@theia/core/lib/browser/theming');
-const {
-  ApplicationProps,
-} = require('@theia/application-package/lib/application-props');
-const {
-  FrontendApplicationConfigProvider,
-} = require('@theia/core/lib/browser/frontend-application-config-provider');
-
-// It is a mighty hack to support theme updates in the bundled IDE2.
-// If the custom theme registration happens before the restoration of the existing monaco themes, then any custom theme changes will be ignored.
-// This patch introduces a static deferred promise in the monaco-theming service that will be resolved when the restoration is ready.
-// IDE2 cannot require the monaco theme service on the outer module level, as it requires the application config provider to be initialized,
-// but the initialization happens only in the generated `index.js`.
-// This patch customizes the monaco theme service behavior before loading the DI containers via the preload.
-// The preload is called only once before the app loads. The Theia extensions are not loaded at that point, but the app config provider is ready.
-const preloader = require('@theia/core/lib/browser/preloader');
-const originalPreload = preloader.preload;
-preloader.preload = async function () {
-  const { MonacoThemingService } = require('@theia/monaco/lib/browser/monaco-theming-service');
-  const { MonacoThemeServiceIsReady } = require('arduino-ide-extension/lib/browser/utils/window');
-  const { Deferred } = require('@theia/core/lib/common/promise-util');
-  const ready = new Deferred();
-  if (!window[MonacoThemeServiceIsReady]) {
-    window[MonacoThemeServiceIsReady] = ready;
-    console.log('Registered a custom monaco-theme service initialization signal on the window object.');
-  }
-  // Here, it is safe to patch the theme service, app config provider is ready.
-  MonacoThemingService.init = async function () {
-    this.updateBodyUiTheme();
-    ThemeService.get().onDidColorThemeChange(() => this.updateBodyUiTheme());
-    await this.restore();
-    ready.resolve();
-  }.bind(MonacoThemingService);
-  return originalPreload();
-}.bind(preloader);
-
-const lightTheme = 'arduino-theme';
-const darkTheme = 'arduino-theme-dark';
-const defaultTheme =
-  window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-    ? darkTheme
-    : lightTheme;
-
-const originalGet = FrontendApplicationConfigProvider.get;
-FrontendApplicationConfigProvider.get = function () {
-  const originalProps = originalGet.bind(FrontendApplicationConfigProvider)();
-  return { ...originalProps, defaultTheme };
-}.bind(FrontendApplicationConfigProvider);
-
-const arduinoDarkTheme = {
-  id: 'arduino-theme-dark',
-  type: 'dark',
-  label: 'Dark (Arduino)',
-  editorTheme: 'arduino-theme-dark',
-  activate() {},
-  deactivate() {},
-};
-
-const arduinoLightTheme = {
-  id: 'arduino-theme',
-  type: 'light',
-  label: 'Light (Arduino)',
-  editorTheme: 'arduino-theme',
-  activate() {},
-  deactivate() {},
-};
-
-if (!window[ThemeServiceSymbol]) {
-  const themeService = new ThemeService();
-  Object.defineProperty(themeService, 'defaultTheme', {
-    get: function () {
-      return (
-        this.themes[defaultTheme] ||
-        this.themes[ApplicationProps.DEFAULT.frontend.config.defaultTheme]
-      );
-    },
-  });
-  themeService.register(
-    ...BuiltinThemeProvider.themes,
-    arduinoDarkTheme,
-    arduinoLightTheme
-  );
-  themeService.startupTheme();
-  themeService.setCurrentTheme(defaultTheme);
-  window[ThemeServiceSymbol] = themeService;
-}
-
-// Require the original, generated `index.js` for `webpack` as the next entry for the `bundle.js`.
-require('../../src-gen/frontend/index');
diff --git a/electron/packager/index.js b/electron/packager/index.js
index a5e785706..eb9430cab 100644
--- a/electron/packager/index.js
+++ b/electron/packager/index.js
@@ -7,6 +7,8 @@
   const glob = require('glob');
   const isCI = require('is-ci');
   shell.env.THEIA_ELECTRON_SKIP_REPLACE_FFMPEG = '1'; // Do not run the ffmpeg validation for the packager.
+  // Note, this will crash on PI if the available memory is less than desired heap size.
+  // https://github.com/shelljs/shelljs/issues/1024#issuecomment-1001552543
   shell.env.NODE_OPTIONS = '--max_old_space_size=4096'; // Increase heap size for the CI
   shell.env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = 'true'; // Skip download and avoid `ERROR: Failed to download Chromium`.
   const template = require('./config').generateTemplate(
@@ -14,7 +16,7 @@
   );
   const utils = require('./utils');
   const merge = require('deepmerge');
-  const { isRelease, isElectronPublish, getChannelFile } = utils;
+  const { isRelease, getChannelFile } = utils;
   const { version } = template;
   const { productName } = template.build;
 
@@ -58,6 +60,11 @@
     .filter((filename) => resourcesToKeep.indexOf(filename) === -1)
     .forEach((filename) => rm('-rf', path('..', 'build', filename)));
 
+  // Clean up the `./electron/build/patch` and `./electron/build/resources` folder with Git.
+  // To avoid file duplication between bundled app and dev mode, some files are copied from `./electron-app` to `./electron/build` folder.
+  const foldersToSyncFromDev = ['patch', 'resources'];
+  foldersToSyncFromDev.forEach(filename => shell.exec(`git -C ${path('..', 'build', filename)} clean -ffxdq`, { async: false }));
+
   const extensions = require('./extensions.json');
   echo(
     `Building the application with the following extensions:\n${extensions
@@ -70,20 +77,28 @@
   // Copy the following items into the `working-copy` folder. Make sure to reuse the `yarn.lock`. |
   //----------------------------------------------------------------------------------------------+
   mkdir('-p', path('..', workingCopy));
-  for (const name of [
+  for (const filename of [
     ...allDependencies,
     'yarn.lock',
     'package.json',
     'lerna.json',
     'i18n'
   ]) {
-    cp('-rf', path(rootPath, name), path('..', workingCopy));
+    cp('-rf', path(rootPath, filename), path('..', workingCopy));
+  }
+
+  //---------------------------------------------------------------------------------------------+
+  // Copy the patched `index.js` for the frontend, the Theia preload, etc. from `./electron-app` |
+  //---------------------------------------------------------------------------------------------+
+  for (const filename of foldersToSyncFromDev) {
+    cp('-rf', path('..', workingCopy, 'electron-app', filename), path('..', 'build'));
   }
 
   //----------------------------------------------+
   // Sanity check: all versions must be the same. |
   //----------------------------------------------+
   verifyVersions(allDependencies);
+
   //----------------------------------------------------------------------+
   // Use the nightly patch version if not a release but requires publish. |
   //----------------------------------------------------------------------+
@@ -438,6 +453,12 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
     }
   }
 
+  /**
+   * @param {import('fs').PathLike} file
+   * @param {string|undefined} [algorithm="sha512"]
+   * @param {BufferEncoding|undefined} [encoding="base64"]
+   * @param {object|undefined} [options]
+   */
   async function hashFile(
     file,
     algorithm = 'sha512',
diff --git a/package.json b/package.json
index 529adac15..7465f2072 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "arduino-ide",
-  "version": "2.0.0-rc9.1",
+  "version": "2.0.0-rc9.2",
   "description": "Arduino IDE",
   "repository": "https://github.com/arduino/arduino-ide.git",
   "author": "Arduino SA",