diff --git a/mcp.json b/mcp.json
index e82c404..8374d3a 100644
--- a/mcp.json
+++ b/mcp.json
@@ -1,35 +1,35 @@
 {
-  "servers": {
-    "context7": {
-      "type": "stdio",
-      "command": "mise",
-      "args": [
-        "x",
-        "npm:@upstash/context7-mcp",
-        "--",
-        "context7-mcp"
-      ]
-    },
-    "sequential-thinking": {
-      "type": "stdio",
-      "command": "mise",
-      "args": [
-        "x",
-        "npm:@modelcontextprotocol/server-sequential-thinking",
-        "--",
-        "mcp-server-sequential-thinking"
-      ]
-    },
-    "memory": {
-      "type": "stdio",
-      "command": "mise",
-      "args": [
-        "x",
-        "npm:@modelcontextprotocol/server-memory",
-        "--",
-        "mcp-server-memory"
-      ]
-    }
-  },
-  "inputs": []
+	"servers": {
+		"context7": {
+			"type": "stdio",
+			"command": "mise",
+			"args": [
+				"x",
+				"npm:@upstash/context7-mcp",
+				"--",
+				"context7-mcp"
+			]
+		},
+		"sequential-thinking": {
+			"type": "stdio",
+			"command": "mise",
+			"args": [
+				"x",
+				"npm:@modelcontextprotocol/server-sequential-thinking",
+				"--",
+				"mcp-server-sequential-thinking"
+			]
+		},
+		"memory": {
+			"type": "stdio",
+			"command": "mise",
+			"args": [
+				"x",
+				"npm:@modelcontextprotocol/server-memory",
+				"--",
+				"mcp-server-memory"
+			]
+		}
+	},
+	"inputs": []
 }
diff --git a/settings.json b/settings.json
index cad4510..6dd4443 100644
--- a/settings.json
+++ b/settings.json
@@ -49,6 +49,7 @@
   // ===========================================================================
   //
   "github.copilot.chat.agent.thinkingTool": true,
+  "github.copilot.nextEditSuggestions.enabled": true,
   //
   // ===========================================================================
   // MARK: Editor
@@ -276,45 +277,6 @@
   ],
   //
   // ===========================================================================
-  // MARK: MCP Servers (VSCode) - Soon to be moved to separate mcp.json file.
-  // ===========================================================================
-  //
-  "mcp": {
-    "servers": {
-      "context7": {
-        "type": "stdio",
-        "command": "mise",
-        "args": [
-          "x",
-          "npm:@upstash/context7-mcp",
-          "--",
-          "context7-mcp"
-        ]
-      },
-      "sequential-thinking": {
-        "type": "stdio",
-        "command": "mise",
-        "args": [
-          "x",
-          "npm:@modelcontextprotocol/server-sequential-thinking",
-          "--",
-          "mcp-server-sequential-thinking"
-        ]
-      },
-      "memory": {
-        "type": "stdio",
-        "command": "mise",
-        "args": [
-          "x",
-          "npm:@modelcontextprotocol/server-memory",
-          "--",
-          "mcp-server-memory"
-        ]
-      }
-    }
-  },
-  //
-  // ===========================================================================
   // MARK: GitHub
   // ===========================================================================
   // Extensions: