diff --git a/.gitignore b/.gitignore
index 52d9bc66e5b6..0d84db4d4767 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,7 @@ validators
 .tmp
 .npmrc
 .vscode/launch.json
-!.vscode/settings.json
+.vscode/settings.json
 .vscode/tasks.json
 
 # Tests artifacts
@@ -82,4 +82,4 @@ packages/cli/.git-data.json
 .last_build_unixsec
 dictionary.dic
 
-temp/
\ No newline at end of file
+temp/
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index d2b074c6eea1..fd7fc672d75d 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "biomejs.biome",
-    "esbenp.prettier-vscode"
+    "esbenp.prettier-vscode",
+    "KalimahApps.tabaqa"
   ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index f83ed88cef76..000000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  // To make this settings effective install `sysoev.vscode-open-in-github` plugin
-  "openInGitHub.defaultBranch": "unstable",
-  "editor.formatOnSave": true,
-  "editor.codeActionsOnSave": {
-    "source.fixAll.biome": "explicit",
-  },
-  "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome"
-  },
-  "[json]": {
-    "editor.defaultFormatter": "biomejs.biome" 
-  },
-  "[jsonc]": {
-    "editor.defaultFormatter": "biomejs.biome" 
-  }
-}
diff --git a/.vscode/tabaqa.json b/.vscode/tabaqa.json
new file mode 100644
index 000000000000..1b62aba08ac7
--- /dev/null
+++ b/.vscode/tabaqa.json
@@ -0,0 +1,23 @@
+{
+  "root": true,
+  "settings": {
+    "window.title": "${activeEditorShort}${separator}${rootName}${separator}${profileName}${separator}[${activeRepositoryBranchName}]",
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.formatOnSave": true,
+    "editor.codeActionsOnSave": {
+      "source.fixAll.biome": "explicit"
+    },
+    "[javascript]": {
+      "editor.defaultFormatter": "biomejs.biome"
+    },
+    "[typescript]": {
+      "editor.defaultFormatter": "biomejs.biome"
+    },
+    "[json]": {
+      "editor.defaultFormatter": "biomejs.biome" 
+    },
+    "[jsonc]": {
+      "editor.defaultFormatter": "biomejs.biome" 
+    }
+  }
+}
\ No newline at end of file