diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts
index b7a89789a..62d11b4d9 100644
--- a/packages/hoppscotch-common/src/components.d.ts
+++ b/packages/hoppscotch-common/src/components.d.ts
@@ -93,6 +93,7 @@ declare module 'vue' {
     HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
     HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
     HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
     HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox']
     HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
     HoppSmartExpand: typeof import('@hoppscotch/ui')['HoppSmartExpand']
diff --git a/packages/hoppscotch-selfhost-desktop/.sitemap-gen/sitemap.xml b/packages/hoppscotch-selfhost-desktop/.sitemap-gen/sitemap.xml
index b2692b2ab..547896936 100644
--- a/packages/hoppscotch-selfhost-desktop/.sitemap-gen/sitemap.xml
+++ b/packages/hoppscotch-selfhost-desktop/.sitemap-gen/sitemap.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1"><url><loc>http://localhost:3000/settings</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/websocket</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/sse</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/socketio</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/mqtt</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/profile</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/join-team</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/import</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/graphql</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/enter</loc><lastmod>2023-10-11T08:05:53.439Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url></urlset>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:news="http://www.google.com/schemas/sitemap-news/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:image="http://www.google.com/schemas/sitemap-image/1.1" xmlns:video="http://www.google.com/schemas/sitemap-video/1.1"><url><loc>http://localhost:3000/settings</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/websocket</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/sse</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/socketio</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/realtime/mqtt</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/profile</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/join-team</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/import</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/graphql</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url><url><loc>http://localhost:3000/enter</loc><lastmod>2023-10-16T06:57:08.802Z</lastmod><changefreq>daily</changefreq><priority>1.0</priority></url></urlset>
\ No newline at end of file
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock
index a301a9ad8..f4e5ba887 100644
--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock
+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.lock
@@ -1273,6 +1273,7 @@ dependencies = [
  "tauri-plugin-store",
  "tauri-plugin-window-state",
  "url",
+ "windows 0.51.1",
 ]
 
 [[package]]
@@ -2072,7 +2073,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3907,7 +3908,17 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3920,6 +3931,15 @@ dependencies = [
  "windows-tokens",
 ]
 
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-implement"
 version = "0.39.0"
@@ -3966,7 +3986,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3986,17 +4006,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -4013,9 +4033,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -4031,9 +4051,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -4049,9 +4069,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4067,9 +4087,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -4085,9 +4105,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -4097,9 +4117,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -4115,9 +4135,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
index bbcec6aec..b46dae3d8 100644
--- a/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/Cargo.toml
@@ -26,7 +26,7 @@ cocoa = "0.25.0"
 objc = "0.2.7"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-# windows = { version = "0.51.1", features = ["Win32_Graphics_Dwm", "Win32_Foundation", "Win32_UI_Controls"] }
+windows = { version = "0.51.1", features = ["Win32_Graphics_Dwm", "Win32_Foundation", "Win32_UI_Controls"] }
 hex_color = "2.0.0"
 
 [features]
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128.png
index 6be5e50e9..a4052c2c8 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128@2x.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128@2x.png
index e81becee5..ab530e9d1 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128@2x.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/128x128@2x.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/32x32.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/32x32.png
index a437dd517..9fbdef4b9 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/32x32.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/32x32.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square107x107Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square107x107Logo.png
index 0ca4f2719..8bffb1f61 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square107x107Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square107x107Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square142x142Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square142x142Logo.png
index b81f82039..e23180999 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square142x142Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square142x142Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square150x150Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square150x150Logo.png
index 624c7bfba..b247d10d5 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square150x150Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square150x150Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square284x284Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square284x284Logo.png
index c021d2ba7..7c7ddc753 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square284x284Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square284x284Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square30x30Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square30x30Logo.png
index 621970023..a8b382820 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square30x30Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square30x30Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square310x310Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square310x310Logo.png
index f9bc04839..a7cea445e 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square310x310Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square310x310Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square44x44Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square44x44Logo.png
index d5fbfb2ab..a6339914e 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square44x44Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square44x44Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square71x71Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square71x71Logo.png
index 63440d798..046ddc8b1 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square71x71Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square71x71Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square89x89Logo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square89x89Logo.png
index f3f705af2..4efd4efdd 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square89x89Logo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/Square89x89Logo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/StoreLogo.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/StoreLogo.png
index 455638826..1ee68eb3c 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/StoreLogo.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/StoreLogo.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.icns b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.icns
index 12a5bcee2..8324d0edb 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.icns and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.icns differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.ico b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.ico
index b3636e4b2..f1f8a700d 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.ico and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.ico differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.png b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.png
index e1cd2619e..9113b698d 100644
Binary files a/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.png and b/packages/hoppscotch-selfhost-desktop/src-tauri/icons/icon.png differ
diff --git a/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs b/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs
index 8bc4066c9..d061234b2 100644
--- a/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs
+++ b/packages/hoppscotch-selfhost-desktop/src-tauri/src/main.rs
@@ -13,7 +13,7 @@ extern crate objc;
 mod mac;
 
 #[cfg(target_os = "windows")]
-mod windows;
+mod win;
 
 use tauri::Manager;
 
@@ -23,10 +23,14 @@ fn main() {
     tauri::Builder::default()
         .setup(|app| {
             if cfg!(target_os = "macos") {
+                #[cfg(target_os = "macos")]
                 use mac::window::setup_mac_window;
 
+                #[cfg(target_os = "macos")]
                 setup_mac_window(app);
             } else if cfg!(target_os = "windows") {
+                use win::window::setup_win_window;
+
                 #[cfg(target_os = "windows")]
                 setup_win_window(app);
             }