diff --git a/CMakePresets.json b/CMakePresets.json
index b0b2ec395..e6eefbfae 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,94 +1,56 @@
 {
-  "version": 3,
-  "configurePresets": [
-    {
-      "name": "default",
-      "binaryDir": "build-default",
-      "cacheVariables": {
-        "DEBUG_OUTPUT": "ON",
-        "AIRSPYHF_DIR": "/opt/install/libairspyhf",
-        "AIRSPY_DIR": "/opt/install/libairspy",
-        "APT_DIR": "/opt/install/aptdec",
-        "BLADERF_DIR": "/opt/install/libbladeRF",
-        "CM256CC_DIR": "/opt/install/cm256cc",
-        "CODEC2_DIR": "/opt/install/codec2",
-        "DAB_DIR": "/opt/install/libdab",
-        "DSDCC_DIR": "/opt/install/dsdcc",
-        "HACKRF_DIR": "/opt/install/libhackrf",
-        "HAMLIB_DIR": "/opt/build/hamlib-prefix",
-        "IIO_DIR": "/opt/install/libiio",
-        "LIBSIGMF_DIR": "/opt/install/libsigmf",
-        "LIMESUITE_DIR": "/opt/install/LimeSuite",
-        "MBE_DIR": "/opt/install/mbelib",
-        "MIRISDR_DIR": "/opt/install/libmirisdr",
-        "PERSEUS_DIR": "/opt/install/libperseus",
-        "RTLSDR_DIR": "/opt/install/librtlsdr",
-        "SERIALDV_DIR": "/opt/install/serialdv",
-        "SGP4_DIR": "/opt/install/sgp4",
-        "SOAPYSDR_DIR": "/opt/install/SoapySDR",
-        "UHD_DIR": "/opt/install/uhd",
-        "XTRX_DIR": "/opt/install/xtrx-images",
-        "CMAKE_INSTALL_PREFIX": "/opt/install/sdrangel"
-      },
-      "warnings": {
-        "dev": false
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [ "Linux" ]
+    "version": 3,
+    "configurePresets": [
+        {
+            "name": "default",
+            "binaryDir": "build-default",
+            "cacheVariables": {
+                "DEBUG_OUTPUT": "ON",
+                "AIRSPYHF_DIR": "/opt/install/libairspyhf",
+                "AIRSPY_DIR": "/opt/install/libairspy",
+                "APT_DIR": "/opt/install/aptdec",
+                "BLADERF_DIR": "/opt/install/libbladeRF",
+                "CM256CC_DIR": "/opt/install/cm256cc",
+                "CODEC2_DIR": "/opt/install/codec2",
+                "DAB_DIR": "/opt/install/libdab",
+                "DSDCC_DIR": "/opt/install/dsdcc",
+                "HACKRF_DIR": "/opt/install/libhackrf",
+                "HAMLIB_DIR": "/opt/build/hamlib-prefix",
+                "IIO_DIR": "/opt/install/libiio",
+                "LIBSIGMF_DIR": "/opt/install/libsigmf",
+                "LIMESUITE_DIR": "/opt/install/LimeSuite",
+                "MBE_DIR": "/opt/install/mbelib",
+                "MIRISDR_DIR": "/opt/install/libmirisdr",
+                "PERSEUS_DIR": "/opt/install/libperseus",
+                "RTLSDR_DIR": "/opt/install/librtlsdr",
+                "SERIALDV_DIR": "/opt/install/serialdv",
+                "SGP4_DIR": "/opt/install/sgp4",
+                "SOAPYSDR_DIR": "/opt/install/SoapySDR",
+                "UHD_DIR": "/opt/install/uhd",
+                "XTRX_DIR": "/opt/install/xtrx-images",
+                "CMAKE_INSTALL_PREFIX": "/opt/install/sdrangel"
+            },
+            "warnings": {
+                "dev": false
+            }
+        },
+        {
+            "name": "default-qt6",
+            "inherits": "default",
+            "binaryDir": "build-qt6",
+            "cacheVariables": {
+                "ENABLE_QT6": "ON"
+            }
         }
-      }
-    },
-    {
-      // Don't inherit from "default", as we don't want UHD_DIR etc set
-      "name": "default-windows",
-      "binaryDir": "c:/users/jon/source/repos/sdrangel/build",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
-        "DEBUG_OUTPUT": "ON",
-        "RX_SAMPLE_24BIT": "ON",
-        "DARCH_OPT": "SSE4_1",
-        "HIDE_CONSOLE": "OFF",
-        "ENABLE_AIRSPY": "ON",
-        "ENABLE_BLADERF": "OFF",
-        "ENABLE_HACKRF": "OFF",
-        "ENABLE_IIO": "OFF",
-        "ENABLE_MIRISDR": "OFF",
-        "ENABLE_PERSEUS": "OFF",
-        "ENABLE_XTRX": "OFF",
-        "BUILD_SERVER": "OFF",
-        "CMAKE_PREFIX_PATH": "C:/Qt/5.15.2/msvc2019_64;C:/Applications/boost_1_81_0"
-      },
-      "warnings": {
-        "dev": false
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioSettings/CMake/1.0": {
-          "hostOS": [ "Windows" ]
+    ],
+    "buildPresets": [
+        {
+          "name": "default",
+          "configurePreset": "default"
+        },
+        {
+            "name": "default-qt6",
+            "configurePreset": "default-qt6"
         }
-      }
-    },
-    {
-      "name": "default-qt6",
-      "inherits": "default",
-      "binaryDir": "build-qt6",
-      "cacheVariables": {
-        "ENABLE_QT6": "ON"
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "default",
-      "configurePreset": "default"
-    },
-    {
-      "name": "default-windows",
-      "configurePreset": "default-windows"
-    },
-    {
-      "name": "default-qt6",
-      "configurePreset": "default-qt6"
-    }
-  ]
+    ]
 }