diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000..e91b4cd3
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,3 @@
+# Sonar project analysis properties overrides
+sonar.projectKey=LizardByte_libdisplaydevice
+sonar.cfamily.reportingCppStandardOverride=c++20
diff --git a/src/windows/win_api_utils.cpp b/src/windows/win_api_utils.cpp
index e7fabe96..d3cef768 100644
--- a/src/windows/win_api_utils.cpp
+++ b/src/windows/win_api_utils.cpp
@@ -6,6 +6,7 @@
 #include "display_device/windows/win_api_utils.h"
 
 // system includes
+#include <format>
 #include <unordered_set>
 
 // local includes
@@ -34,7 +35,7 @@ namespace {
    * @examples_end
    */
   std::string toString(const LUID &id) {
-    return std::to_string(id.HighPart) + std::to_string(id.LowPart);
+    return std::format("{}{}", id.HighPart, id.LowPart);
   }
 
   /**
diff --git a/src/windows/win_display_device_topology.cpp b/src/windows/win_display_device_topology.cpp
index 6e1f21ce..55c73545 100644
--- a/src/windows/win_display_device_topology.cpp
+++ b/src/windows/win_display_device_topology.cpp
@@ -7,6 +7,7 @@
 
 // system includes
 #include <algorithm>
+#include <format>
 #include <unordered_set>
 
 // local includes
@@ -75,7 +76,7 @@ namespace display_device {
         return {};
       }
 
-      const std::string lazy_lookup {std::to_string(source_mode->position.x) + std::to_string(source_mode->position.y)};
+      const std::string lazy_lookup {std::format("{}{}", source_mode->position.x, source_mode->position.y)};
       auto index_it {position_to_topology_index.find(lazy_lookup)};
 
       if (index_it == std::end(position_to_topology_index)) {
diff --git a/tests/unit/general/test_logging.cpp b/tests/unit/general/test_logging.cpp
index 74576f9e..080cbf7f 100644
--- a/tests/unit/general/test_logging.cpp
+++ b/tests/unit/general/test_logging.cpp
@@ -1,5 +1,6 @@
 // system includes
 #include <exception>
+#include <format>
 
 // local includes
 #include "display_device/logging.h"
@@ -130,7 +131,7 @@ TEST_S(CustomCallback) {
   std::string output;
   logger.setLogLevel(level::verbose);
   logger.setCustomCallback([&output](const level level, const std::string &value) {
-    output = std::to_string(static_cast<level_t>(level)) + " " + value;
+    output = std::format("{} {}", static_cast<level_t>(level), value);
   });
 
   logger.write(level::verbose, "Hello World!");
diff --git a/tests/unit/windows/test_win_api_utils.cpp b/tests/unit/windows/test_win_api_utils.cpp
index 3d3203c3..ecda1173 100644
--- a/tests/unit/windows/test_win_api_utils.cpp
+++ b/tests/unit/windows/test_win_api_utils.cpp
@@ -1,3 +1,6 @@
+// system includes
+#include <format>
+
 // local includes
 #include "display_device/windows/win_api_utils.h"
 #include "fixtures/fixtures.h"
@@ -18,15 +21,15 @@ namespace {
       for (int i = 1; i <= number_of_calls; ++i) {
         EXPECT_CALL(m_layer, getMonitorDevicePath(_))
           .Times(1)
-          .WillOnce(Return("Path" + std::to_string(i)))
+          .WillOnce(Return(std::format("Path{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(m_layer, getDeviceId(_))
           .Times(1)
-          .WillOnce(Return("DeviceId" + std::to_string(i)))
+          .WillOnce(Return(std::format("DeviceId{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(m_layer, getDisplayName(_))
           .Times(1)
-          .WillOnce(Return("DisplayName" + std::to_string(i)))
+          .WillOnce(Return(std::format("DisplayName{}", i)))
           .RetiresOnSaturation();
       }
     }
diff --git a/tests/unit/windows/test_win_display_device_general.cpp b/tests/unit/windows/test_win_display_device_general.cpp
index 365bb6c6..9abd92d8 100644
--- a/tests/unit/windows/test_win_display_device_general.cpp
+++ b/tests/unit/windows/test_win_display_device_general.cpp
@@ -1,3 +1,6 @@
+// system includes
+#include <format>
+
 // local includes
 #include "display_device/windows/settings_utils.h"
 #include "display_device/windows/win_api_layer.h"
@@ -109,15 +112,15 @@ TEST_F_S_MOCKED(EnumAvailableDevices) {
   for (int i = 1; i <= 3; ++i) {
     EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
       .Times(1)
-      .WillOnce(Return("Path" + std::to_string(i)))
+      .WillOnce(Return(std::format("Path{}", i)))
       .RetiresOnSaturation();
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
     EXPECT_CALL(*m_layer, getDisplayName(_))
       .Times(1)
-      .WillOnce(Return("DisplayName" + std::to_string(i)))
+      .WillOnce(Return(std::format("DisplayName{}", i)))
       .RetiresOnSaturation();
   }
 
@@ -220,15 +223,15 @@ TEST_F_S_MOCKED(EnumAvailableDevices, MissingSourceModes) {
   for (int i = 1; i <= 2; ++i) {
     EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
       .Times(1)
-      .WillOnce(Return("Path" + std::to_string(i)))
+      .WillOnce(Return(std::format("Path{}", i)))
       .RetiresOnSaturation();
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
     EXPECT_CALL(*m_layer, getDisplayName(_))
       .Times(1)
-      .WillOnce(Return("DisplayName" + std::to_string(i)))
+      .WillOnce(Return(std::format("DisplayName{}", i)))
       .RetiresOnSaturation();
   }
 
diff --git a/tests/unit/windows/test_win_display_device_hdr.cpp b/tests/unit/windows/test_win_display_device_hdr.cpp
index fa1f2f02..7113aed8 100644
--- a/tests/unit/windows/test_win_display_device_hdr.cpp
+++ b/tests/unit/windows/test_win_display_device_hdr.cpp
@@ -1,3 +1,6 @@
+// system includes
+#include <format>
+
 // local includes
 #include "display_device/windows/settings_utils.h"
 #include "display_device/windows/win_api_layer.h"
@@ -35,7 +38,7 @@ namespace {
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDeviceId(_))
           .Times(1)
-          .WillOnce(Return("DeviceId" + std::to_string(i)))
+          .WillOnce(Return(std::format("DeviceId{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDisplayName(_))
           .Times(1)
diff --git a/tests/unit/windows/test_win_display_device_modes.cpp b/tests/unit/windows/test_win_display_device_modes.cpp
index d0b0ab45..9b105e31 100644
--- a/tests/unit/windows/test_win_display_device_modes.cpp
+++ b/tests/unit/windows/test_win_display_device_modes.cpp
@@ -1,4 +1,5 @@
 // system includes
+#include <format>
 #include <ranges>
 
 // local includes
@@ -39,7 +40,7 @@ namespace {
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDeviceId(_))
           .Times(1)
-          .WillOnce(Return("DeviceId" + std::to_string(i)))
+          .WillOnce(Return(std::format("DeviceId{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDisplayName(_))
           .Times(1)
@@ -69,30 +70,30 @@ namespace {
         for (int i = 1; i <= entry; ++i) {
           EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
             .Times(1)
-            .WillOnce(Return("Path" + std::to_string(i)))
+            .WillOnce(Return(std::format("Path{}", i)))
             .RetiresOnSaturation();
           EXPECT_CALL(*m_layer, getDeviceId(_))
             .Times(1)
-            .WillOnce(Return("DeviceId" + std::to_string(i)))
+            .WillOnce(Return(std::format("DeviceId{}", i)))
             .RetiresOnSaturation();
           EXPECT_CALL(*m_layer, getDisplayName(_))
             .Times(1)
-            .WillOnce(Return("DisplayName" + std::to_string(i)))
+            .WillOnce(Return(std::format("DisplayName{}", i)))
             .RetiresOnSaturation();
         }
 
         for (int i = 1; i <= 4; ++i) {
           EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
             .Times(1)
-            .WillOnce(Return("Path" + std::to_string(i)))
+            .WillOnce(Return(std::format("Path{}", i)))
             .RetiresOnSaturation();
           EXPECT_CALL(*m_layer, getDeviceId(_))
             .Times(1)
-            .WillOnce(Return("DeviceId" + std::to_string(i)))
+            .WillOnce(Return(std::format("DeviceId{}", i)))
             .RetiresOnSaturation();
           EXPECT_CALL(*m_layer, getDisplayName(_))
             .Times(1)
-            .WillOnce(Return("DisplayName" + std::to_string(i)))
+            .WillOnce(Return(std::format("DisplayName{}", i)))
             .RetiresOnSaturation();
         }
       }
diff --git a/tests/unit/windows/test_win_display_device_primary.cpp b/tests/unit/windows/test_win_display_device_primary.cpp
index 3548c52b..622cb62b 100644
--- a/tests/unit/windows/test_win_display_device_primary.cpp
+++ b/tests/unit/windows/test_win_display_device_primary.cpp
@@ -1,3 +1,6 @@
+// system includes
+#include <format>
+
 // local includes
 #include "display_device/windows/settings_utils.h"
 #include "display_device/windows/win_api_layer.h"
@@ -36,7 +39,7 @@ namespace {
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDeviceId(_))
           .Times(1)
-          .WillOnce(Return("DeviceId" + std::to_string(i)))
+          .WillOnce(Return(std::format("DeviceId{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDisplayName(_))
           .Times(1)
@@ -202,7 +205,7 @@ TEST_F_S_MOCKED(SetAsPrimary, DuplicatePrimaryDevicesSet) {
   for (int i = 1; i <= 4; ++i) {
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
   }
 
@@ -232,7 +235,7 @@ TEST_F_S_MOCKED(SetAsPrimary, NonDuplicatePrimaryDeviceSet) {
   for (int i = 1; i <= 4; ++i) {
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
   }
 
@@ -262,7 +265,7 @@ TEST_F_S_MOCKED(SetAsPrimary, SharedModeShiftedOnce) {
   for (int i = 1; i <= 4; ++i) {
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
   }
 
@@ -359,7 +362,7 @@ TEST_F_S_MOCKED(SetAsPrimary, FailedToSetDisplayConfig) {
   for (int i = 1; i <= 4; ++i) {
     EXPECT_CALL(*m_layer, getDeviceId(_))
       .Times(1)
-      .WillOnce(Return("DeviceId" + std::to_string(i)))
+      .WillOnce(Return(std::format("DeviceId{}", i)))
       .RetiresOnSaturation();
   }
 
diff --git a/tests/unit/windows/test_win_display_device_topology.cpp b/tests/unit/windows/test_win_display_device_topology.cpp
index 81aad180..afc56fe7 100644
--- a/tests/unit/windows/test_win_display_device_topology.cpp
+++ b/tests/unit/windows/test_win_display_device_topology.cpp
@@ -1,3 +1,6 @@
+// system includes
+#include <format>
+
 // local includes
 #include "display_device/windows/settings_utils.h"
 #include "display_device/windows/win_api_layer.h"
@@ -37,15 +40,15 @@ namespace {
       for (int i = 1; i <= 3; ++i) {
         EXPECT_CALL(*m_layer, getMonitorDevicePath(_))
           .Times(1)
-          .WillOnce(Return("Path" + std::to_string(i)))
+          .WillOnce(Return(std::format("Path{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDeviceId(_))
           .Times(1)
-          .WillOnce(Return("DeviceId" + std::to_string(i)))
+          .WillOnce(Return(std::format("DeviceId{}", i)))
           .RetiresOnSaturation();
         EXPECT_CALL(*m_layer, getDisplayName(_))
           .Times(1)
-          .WillOnce(Return("DisplayName" + std::to_string(i)))
+          .WillOnce(Return(std::format("DisplayName{}", i)))
           .RetiresOnSaturation();
       }
     }