diff --git a/.vscode/launch.json b/.vscode/launch.json
index e9102e0..76a9017 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -5,23 +5,45 @@
     "version": "0.2.0",
     "configurations": [
     {
-      "name": "Debug Linux",
+      "name": "Debug Linux GLFW",
       "type": "cppdbg",
       "request": "launch",
       "MIMode": "gdb",
       "program": "${workspaceFolder}/bin/TSE-RTS",
-      "preLaunchTask": "build_debug_linux",
+      "preLaunchTask": "build_debug_GLFW_linux",
       "args": [],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/bin"
     },
     {
-      "name": "Debug Windows",
+      "name": "Debug Linux SDL3",
+      "type": "cppdbg",
+      "request": "launch",
+      "MIMode": "gdb",
+      "program": "${workspaceFolder}/bin/TSE-RTS",
+      "preLaunchTask": "build_debug_SDL3_linux",
+      "args": [],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}/bin"
+    },
+    {
+      "name": "Debug Windows GLFW",
       "type": "cppvsdbg",
       "request": "launch",
       //"MIMode": "gdb",
       "program": "${workspaceFolder}/bin/TSE-RTS",
-      "preLaunchTask": "build_debug_linux",
+      "preLaunchTask": "build_debug_GLFW_linux",
+      "args": [],
+      "stopAtEntry": false,
+      "cwd": "${workspaceFolder}/bin"
+    },
+    {
+      "name": "Debug Windows SDL3",
+      "type": "cppvsdbg",
+      "request": "launch",
+      //"MIMode": "gdb",
+      "program": "${workspaceFolder}/bin/TSE-RTS",
+      "preLaunchTask": "build_debug_SDL3_linux",
       "args": [],
       "stopAtEntry": false,
       "cwd": "${workspaceFolder}/bin"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 0fa5a63..98ba99c 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,7 +20,7 @@
         "problemMatcher": []
         },
         {
-        "label": "build_debug_linux_cmake",
+        "label": "build_debug_SDL3_linux_cmake",
         "type": "shell",
         "command": "cmake",
         "args": [
@@ -28,7 +28,6 @@
             "${workspaceFolder}/.",
             "-B",
             "${workspaceFolder}/./build",
-            "-DDEBUG=ON",
             "-G Ninja",
             "-DCMAKE_C_COMPILER=clang",
             "-DCMAKE_CXX_COMPILER=clang++",
@@ -41,9 +40,30 @@
             "isDefault": true
         },
         "problemMatcher": []
-        },
-        {
-        "label": "build_release_linux_cmake",
+        },{
+        "label": "build_debug_GLFW_linux_cmake",
+        "type": "shell",
+        "command": "cmake",
+        "args": [
+            "-S",
+            "${workspaceFolder}/.",
+            "-B",
+            "${workspaceFolder}/./build",
+            "-G Ninja",
+            "-DCMAKE_C_COMPILER=clang",
+            "-DCMAKE_CXX_COMPILER=clang++",
+            "-DCMAKE_LINKER=lld-link",
+            "-DCMAKE_BUILD_TYPE=Debug",
+            "-DUSE_GLFW=ON"
+        ],
+        "group": {
+            "kind": "build",
+            "isDefault": true
+        },
+        "problemMatcher": []
+        },
+        {
+        "label": "build_release_SDL3_linux_cmake",
         "type": "shell",
         "command": "cmake",
         "args": [
@@ -51,7 +71,6 @@
             "${workspaceFolder}/.",
             "-B",
             "${workspaceFolder}/./build",
-            "-DDEBUG=OFF",
             "-G Ninja",
             "-DCMAKE_C_COMPILER=clang",
             "-DCMAKE_CXX_COMPILER=clang++",
@@ -66,9 +85,31 @@
         "problemMatcher": []
         },
         {
-        "label": "build_debug_linux",
+        "label": "build_release_GLFW_linux_cmake",
+        "type": "shell",
+        "command": "cmake",
+        "args": [
+            "-S",
+            "${workspaceFolder}/.",
+            "-B",
+            "${workspaceFolder}/./build",
+            "-G Ninja",
+            "-DCMAKE_C_COMPILER=clang",
+            "-DCMAKE_CXX_COMPILER=clang++",
+            "-DCMAKE_LINKER=lld-link",
+            "-DCMAKE_BUILD_TYPE=Release",
+            "-DUSE_GLFW=ON"
+        ],
+        "group": {
+            "kind": "build",
+            "isDefault": true
+        },
+        "problemMatcher": []
+        },
+        {
+        "label": "build_debug_SDL3_linux",
         "dependsOn": [
-            "build_debug_linux_cmake",
+            "build_release_SDL3_linux_cmake",
             "make_linux"
         ],
         "dependsOrder": "sequence",
@@ -79,9 +120,35 @@
         }
         },
         {
-        "label": "build_release_linux",
+        "label": "build_release_SDL3_linux",
         "dependsOn": [
-            "build_release_linux_cmake",
+            "build_release_SDL3_linux_cmake",
+            "make_linux"
+        ],
+        "dependsOrder": "sequence",
+        "problemMatcher": [],
+        "group": {
+            "kind": "build",
+            "isDefault": true
+        }
+        },
+        {
+        "label": "build_debug_GLFW_linux",
+        "dependsOn": [
+            "build_release_GLFW_linux_cmake",
+            "make_linux"
+        ],
+        "dependsOrder": "sequence",
+        "problemMatcher": [],
+        "group": {
+            "kind": "build",
+            "isDefault": true
+        }
+        },
+        {
+        "label": "build_release_GLFW_linux",
+        "dependsOn": [
+            "build_release_GLFW_linux_cmake",
             "make_linux"
         ],
         "dependsOrder": "sequence",
diff --git a/TSE b/TSE
index 51a6ea1..8c0152c 160000
--- a/TSE
+++ b/TSE
@@ -1 +1 @@
-Subproject commit 51a6ea13286ecf221a7195002db594e828f4e626479cc248c0e36457c77d0eec
+Subproject commit 8c0152c3b470c0665ed4e82f0551e7364cfe713ad785274d92c2529097f89c91