diff --git a/LICENSE.md b/LICENSE.md
index 645e5425..eb3061b0 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2024 FIRST and other WPILib contributors
+Copyright (c) 2009-2026 FIRST and other WPILib contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index d70614e3..888c2c08 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,9 @@ Once you have the project open in VS Code, there are 5 debugging targets set up.
 - `Extension` Will launch the extension to debug
 - `Extension Tests` Will launch the extension tests
 
-In addition, each project has a `compile` and a `lint` npm command. These will compile and lint their respective projects. Please run these before submitting any PR, as CI will check these. In addition, VS Code's lint does not detect the same lint errors as running lint manually would.
+In addition, `vscode-wpilib` has a `compile` and a `lint` npm command. This will compile and lint the project's files. Please run these commands before submitting a PR! 
+
+**Note: VSCode's built-in linter will not detect all linters used in this project, and `npm run compile` and `npm run lint` should be used instead.**
 
 ## Testing
 
diff --git a/vscode-wpilib/package-lock.json b/vscode-wpilib/package-lock.json
index 24d67bcf..e564f387 100644
--- a/vscode-wpilib/package-lock.json
+++ b/vscode-wpilib/package-lock.json
@@ -9803,4 +9803,4 @@
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/vscode-wpilib/resources/gradle/java/build.gradle b/vscode-wpilib/resources/gradle/java/build.gradle
index ae5ca87e..f940df44 100644
--- a/vscode-wpilib/resources/gradle/java/build.gradle
+++ b/vscode-wpilib/resources/gradle/java/build.gradle
@@ -47,9 +47,6 @@ def deployArtifact = deploy.targets.systemcore.artifacts.frcJava
 // performance.
 wpi.java.debugJni = false
 
-// Set this to true to enable desktop support.
-def includeDesktopSupport = false
-
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 5.
 dependencies {
diff --git a/vscode-wpilib/resources/gradle/javaromi/build.gradle b/vscode-wpilib/resources/gradle/javaromi/build.gradle
index 74d92be8..c5839d65 100644
--- a/vscode-wpilib/resources/gradle/javaromi/build.gradle
+++ b/vscode-wpilib/resources/gradle/javaromi/build.gradle
@@ -10,9 +10,6 @@ java {
 
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
 
-// Set this to true to enable desktop support.
-def includeDesktopSupport = true
-
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 5.
 dependencies {
diff --git a/vscode-wpilib/resources/gradle/javaxrp/build.gradle b/vscode-wpilib/resources/gradle/javaxrp/build.gradle
index 69fa5c11..48eab2ed 100644
--- a/vscode-wpilib/resources/gradle/javaxrp/build.gradle
+++ b/vscode-wpilib/resources/gradle/javaxrp/build.gradle
@@ -10,9 +10,6 @@ java {
 
 def ROBOT_MAIN_CLASS = "###ROBOTCLASSREPLACE###"
 
-// Set this to true to enable desktop support.
-def includeDesktopSupport = true
-
 // Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
 // Also defines JUnit 5.
 dependencies {
diff --git a/vscode-wpilib/src/webviews/pages/projectcreatorpage.ts b/vscode-wpilib/src/webviews/pages/projectcreatorpage.ts
index eca004c7..4b02ae47 100644
--- a/vscode-wpilib/src/webviews/pages/projectcreatorpage.ts
+++ b/vscode-wpilib/src/webviews/pages/projectcreatorpage.ts
@@ -312,7 +312,14 @@ function setupEventListeners() {
       type: 'base',
     });
 
-    validateStep2();
+  const desktopCb = document.getElementById('desktopCB') as HTMLInputElement;
+    if (languageSelect.value !== 'cpp') {
+      desktopCb.disabled = true;
+      desktopCb.title = 'Desktop Support can only be enabled for C++ projects!';
+    } else {
+      desktopCb.disabled = false;
+      validateStep2();
+    }
   });
 
   const baseSelect = document.getElementById('base-select') as HTMLSelectElement;