diff --git a/.gitmodules b/.gitmodules
index b4fa52d..22495d0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "elemento-gui-new"]
-	path = elemento-gui-new
+	path = ./electros-electron/elemento-gui-new
 	url = git@github.com:Elemento-Modular-Cloud/elemento-gui-new.git
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 85118d7..20b8d1e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -34,9 +34,9 @@ FROM nginx:trixie
 # entrypoint must run the electros app on port 80
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 COPY electros-daemons/linux/x64/* /opt/daemons/
-COPY elemento-gui-new/ /usr/share/nginx/html/
-COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
-COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
+COPY electros-electron/elemento-gui-new/ /usr/share/nginx/html/
+COPY electros-electron/elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
+COPY electros-electron/elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
 COPY docker/startup.sh /opt/app/startup.sh
 COPY ./docker/follow_log.sh /opt/app/follow_log.sh
 COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
diff --git a/docker/arm_Dockerfile b/docker/arm_Dockerfile
index fe66938..606a296 100644
--- a/docker/arm_Dockerfile
+++ b/docker/arm_Dockerfile
@@ -35,9 +35,9 @@ FROM nginx:trixie
 # entrypoint must run the electros app on port 80
 COPY ./docker/nginx.conf /etc/nginx/nginx.conf
 COPY electros-daemons/linux/arm64/* /opt/daemons/
-COPY elemento-gui-new/ /usr/share/nginx/html/
-COPY elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
-COPY elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
+COPY electros-electron/elemento-gui-new/ /usr/share/nginx/html/
+COPY electros-electron/elemento-gui-new/electros/configs/atomosFlags.json /usr/share/nginx/html/electros/configs/flags.json
+COPY electros-electron/elemento-gui-new/electros/electrosOnAtomos.html /usr/share/nginx/html/electros/electros.html
 COPY ./docker/arm_startup.sh /opt/app/startup.sh
 COPY ./docker/follow_log.sh /opt/app/follow_log.sh
 COPY ./docker/logger_stream.sh /opt/app/logger_stream.sh
diff --git a/electros-electron/common/Loaders.js b/electros-electron/common/Loaders.js
index 53f5514..e77c071 100644
--- a/electros-electron/common/Loaders.js
+++ b/electros-electron/common/Loaders.js
@@ -19,8 +19,8 @@ export class Loaders {
         try {
             this.Css.Titlebar = fs.readFileSync(path.join(__dirname, 'titlebar', 'titlebar.css'), 'utf8');
             const titlebarTempJs = fs.readFileSync(path.join(__dirname, 'titlebar', 'titlebar.js'), 'utf8');
-            this.Css.Themes = fs.readFileSync(path.join(__dirname, 'electros', 'css', 'themes.css'), 'utf8');
-            this.Css.FormControl = fs.readFileSync(path.join(__dirname, 'electros', 'css', 'form-controls.css'), 'utf8');
+            this.Css.Themes = fs.readFileSync(path.join(__dirname, 'elemento-gui-new', 'electros', 'css', 'themes.css'), 'utf8');
+            this.Css.FormControl = fs.readFileSync(path.join(__dirname, 'elemento-gui-new', 'electros', 'css', 'form-controls.css'), 'utf8');
 
             this.Js.Themes = `
             var theme = document.createElement('style');
diff --git a/electros-electron/common/TrayIcon.js b/electros-electron/common/TrayIcon.js
index 6fe5b5f..bbec476 100644
--- a/electros-electron/common/TrayIcon.js
+++ b/electros-electron/common/TrayIcon.js
@@ -30,19 +30,19 @@ export class TrayIcon {
         console.log(`The theme is light: ${isLight}`);
 
         if (platform.isMac()) {
-            const templateIcon = path.join(__dirname, 'electros.iconset', 'tray_icon_black_32x32@2x.png');
+            const templateIcon = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon_black_32x32@2x.png');
             const icon = nativeImage.createFromPath(templateIcon);
             icon.setTemplateImage(true);
             return icon;
         }
 
         if (platform.isWin()) {
-            const iconName = path.join(__dirname, 'electros.iconset', 'tray_icon.ico');
+            const iconName = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon.ico');
             return nativeImage.createFromPath(iconName);
         }
 
         if (platform.isLinux()) {
-            const iconName = path.join(__dirname, 'electros.iconset', 'tray_icon.png');
+            const iconName = path.join(__dirname, 'elemento-gui-new', 'electros.iconset', 'tray_icon.png');
             const icon = nativeImage.createFromPath(iconName);
             return icon;
         }
diff --git a/electros-electron/electros b/electros-electron/electros
deleted file mode 120000
index 43a12ea..0000000
--- a/electros-electron/electros
+++ /dev/null
@@ -1 +0,0 @@
-../elemento-gui-new/electros/
\ No newline at end of file
diff --git a/electros-electron/electros.iconset b/electros-electron/electros.iconset
deleted file mode 120000
index 05aaea5..0000000
--- a/electros-electron/electros.iconset
+++ /dev/null
@@ -1 +0,0 @@
-../elemento-gui-new/electros.iconset/
\ No newline at end of file
diff --git a/electros-electron/elemento-gui-new b/electros-electron/elemento-gui-new
new file mode 160000
index 0000000..d40ef86
--- /dev/null
+++ b/electros-electron/elemento-gui-new
@@ -0,0 +1 @@
+Subproject commit d40ef8669cdf2cb1b19b27b972cdf9b9822f99f8
diff --git a/electros-electron/main.js b/electros-electron/main.js
index 2978b9f..5ff3e69 100644
--- a/electros-electron/main.js
+++ b/electros-electron/main.js
@@ -51,7 +51,7 @@ function createMainWindow() {
         win.setWindowButtonVisibility(false);
     }
 
-    win.loadFile('electros/electros.html');
+    win.loadFile('./elemento-gui-new/electros/electros.html');
 
     // Inject custom titlebar after the page loads
     win.webContents.on('did-finish-load', () => {
@@ -364,7 +364,7 @@ ipcMain.handle('open-ssh', async (event, connectionDetails) => {
         const sshPath = path.join(
             baseDir,
             app.isPackaged ? 'app.asar.unpacked' : '',
-            'electros', 'remotes', 'ssh', 'ssh.cjs'
+            'elemento-gui-new', 'electros', 'remotes', 'ssh', 'ssh.cjs'
         );
 
         // Start the SSH server process
diff --git a/electros-electron/package.json b/electros-electron/package.json
index 233017e..93170c1 100644
--- a/electros-electron/package.json
+++ b/electros-electron/package.json
@@ -89,7 +89,8 @@
             "target": [
                 "AppImage",
                 "deb",
-                "rpm"
+                "rpm",
+                "pacman"
             ],
             "maintainer": "Elemento Cloud Srl <hello@elemento.cloud>",
             "category": "Utility"
@@ -119,7 +120,7 @@
     },
     "devDependencies": {
         "electron": "^40.1.0",
-        "electron-builder": "^25.1.8"
+        "electron-builder": "^26.7.0"
     },
     "overrides": {
         "inflight": "^2.0.0",
diff --git a/electros-electron/remotes/Ssh.js b/electros-electron/remotes/Ssh.js
index 038af38..df4301f 100644
--- a/electros-electron/remotes/Ssh.js
+++ b/electros-electron/remotes/Ssh.js
@@ -41,7 +41,7 @@ class SshWindow {
             const baseDir = app.isPackaged ? process.resourcesPath : this.__dirname;
             const sshPath = path.join(
                 baseDir, app.isPackaged ? 'app.asar.unpacked' : '',
-                'electros', 'remotes', 'ssh', 'ssh.cjs'
+                'elemento-gui-new', 'electros', 'remotes', 'ssh', 'ssh.cjs'
             );
 
 
diff --git a/electros-electron/terminal/terminal.html b/electros-electron/terminal/terminal.html
index 91d7998..b3dded4 100644
--- a/electros-electron/terminal/terminal.html
+++ b/electros-electron/terminal/terminal.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
     <link rel="stylesheet" href="../node_modules/@xterm/xterm/css/xterm.css" />
-    <link rel="stylesheet" href="../electros/css/style.css" />
+    <link rel="stylesheet" href="../elemento-gui-new/electros/css/style.css" />
     <style>
         * {
             box-sizing: border-box;
diff --git a/electros-electron/windows/Rdp.js b/electros-electron/windows/Rdp.js
index bdcbfee..e0f6e13 100644
--- a/electros-electron/windows/Rdp.js
+++ b/electros-electron/windows/Rdp.js
@@ -73,7 +73,7 @@ export class RdpWindow {
                 const mstscPath = path.join(
                     baseDir,
                     app.isPackaged ? 'app.asar.unpacked' : '',
-                    'electros', 'remotes', 'rdp', 'mstsc-rs'
+                    'elemento-gui-new', 'electros', 'remotes', 'rdp', 'mstsc-rs'
                 );
 
                 const spawnOptions = {
@@ -269,7 +269,7 @@ export class RdpWindow {
             throw new Error("RDP Window not instantiated");
         }
         try {
-            await this._window.loadFile('electros/remotes/rdp/index.html', {
+            await this._window.loadFile('elemento-gui-new/electros/remotes/rdp/index.html', {
                 query: connectionDetails
             });
         } catch (error) {
diff --git a/elemento-gui-new b/elemento-gui-new
deleted file mode 160000
index 806be7b..0000000
--- a/elemento-gui-new
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 806be7be99bb200a45c64b6e9d9c27fc9877532c