diff --git a/.vscode/launch.json b/.vscode/launch.json
index 81416f8e04..b3473ffa74 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -20,13 +20,28 @@
       }
     },
     {
-      "name": "meson Debug (Release)",
+      "name": "meson Configure Final & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "meson Build Release",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "unix"
+      }
+    },
+    {
+      "name": "meson Configure Debug (Release) & Launch",
+      "type": "cppdbg",
+      "osx": {
+        "MIMode": "lldb"
+      },
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Release)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -35,13 +50,13 @@
       }
     },
     {
-      "name": "meson Debug (Minimal)",
+      "name": "meson Configure Debug (Minimal) & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Minimal)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -50,13 +65,13 @@
       }
     },
     {
-      "name": "meson Debug (Full)",
+      "name": "meson Configure Debug (Full) & Launch",
       "type": "cppdbg",
       "osx": {
         "MIMode": "lldb"
       },
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand_debug",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/CortexCommand",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Full)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -116,6 +131,18 @@
       "request": "launch",
       "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Meson: Build all targets",
+      "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
+      "presentation": {
+        "group": "windows"
+      }
+    },
+    {
+      "name": "meson Configure Final & Launch [Windows]",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
+      "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Release",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
       "presentation": {
@@ -123,10 +150,10 @@
       }
     },
     {
-      "name": "meson Debug (Release) [Windows]",
+      "name": "meson Configure Debug (Release) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.release.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Release)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -135,10 +162,10 @@
       }
     },
     {
-      "name": "meson Debug (Minimal) [Windows]",
+      "name": "meson Configure Debug (Minimal) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.minimal.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Minimal)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
@@ -147,10 +174,10 @@
       }
     },
     {
-      "name": "meson Debug (Full) [Windows]",
+      "name": "meson Configure Debug (Full) & Launch [Windows]",
       "type": "cppvsdbg",
       "request": "launch",
-      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.debug.full.exe",
+      "program": "${workspaceFolder}/${config:mesonbuild.buildFolder}/Cortex Command.exe",
       "cwd": "${workspaceFolder}",
       "preLaunchTask": "meson Build Debug (Full)",
       "envFile": "${workspaceFolder}/${config:mesonbuild.buildFolder}/meson-vscode.env",
diff --git a/meson.build b/meson.build
index 604c0d7797..a2c6e76482 100644
--- a/meson.build
+++ b/meson.build
@@ -120,16 +120,12 @@ elif compiler.get_argument_syntax()== 'msvc'
   link_args+=['-ignore:4099', '-ignore:4217']
   buildtype_debug = get_option('debug')
   if buildtype_debug
-    elfname+='.debug'
     debug_type = get_option('debug_type')
     if debug_type == 'release'
-      elfname+='.release'
       preprocessor_flags += ['-DDEBUG_RELEASE_BUILD'] # enable minimal debug features
     elif debug_type == 'minimal'
-      elfname += '.minimal'
       preprocessor_flags += ['-DDEBUGMODE'] # enable some debug features
     elif debug_type == 'full'
-      elfname += '.full'
       preprocessor_flags += ['-DDEBUG_BUILD', '-DDEBUGMODE'] # enable all debug features; may slow down game
     endif
   else