diff --git a/Controllers/RazerController/RazerController.cpp b/Controllers/RazerController/RazerController.cpp
index a914e5ea..e6a0ecf2 100644
--- a/Controllers/RazerController/RazerController.cpp
+++ b/Controllers/RazerController/RazerController.cpp
@@ -165,6 +165,8 @@ RazerController::RazerController(hid_device* dev_handle, hid_device* dev_argb_ha
         case RAZER_BLADE_PRO_2017_FULLHD_PID:
         case RAZER_BLADE_PRO_2019_PID:
         case RAZER_BLADE_PRO_LATE_2019_PID:
+        case RAZER_BLADE_PRO_17_2020_PID:
+        case RAZER_BLADE_PRO_17_2021_PID:
         case RAZER_BLADE_STEALTH_2016_PID:
         case RAZER_BLADE_STEALTH_LATE_2016_PID:
         case RAZER_BLADE_STEALTH_2017_PID:
@@ -455,6 +457,8 @@ bool RazerController::SupportsWave()
         case RAZER_BLADE_PRO_2017_FULLHD_PID:
         case RAZER_BLADE_PRO_2019_PID:
         case RAZER_BLADE_PRO_LATE_2019_PID:
+        case RAZER_BLADE_PRO_17_2020_PID:
+        case RAZER_BLADE_PRO_17_2021_PID:
         case RAZER_BLADE_STEALTH_2016_PID:
         case RAZER_BLADE_STEALTH_LATE_2016_PID:
         case RAZER_BLADE_STEALTH_2017_PID:
diff --git a/Controllers/RazerController/RazerControllerDetect.cpp b/Controllers/RazerController/RazerControllerDetect.cpp
index 96ab35d9..a10fea4e 100644
--- a/Controllers/RazerController/RazerControllerDetect.cpp
+++ b/Controllers/RazerController/RazerControllerDetect.cpp
@@ -257,6 +257,8 @@ REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2017)",                          Det
 REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2017 FullHD)",                   DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_PRO_2017_FULLHD_PID,                0x00,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (2019)",                          DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_PRO_2019_PID,                       0x00,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Blade Pro (Late 2019)",                     DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_PRO_LATE_2019_PID,                  0x00,   0x01,   0x02);
+REGISTER_HID_DETECTOR_IPU("Razer Blade Pro 17 (2020)",                       DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_PRO_17_2020_PID,                    0x00,   0x01,   0x02);
+REGISTER_HID_DETECTOR_IPU("Razer Blade Pro 17 (2021)",                       DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_PRO_17_2021_PID,                    0x00,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2016)",                      DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_STEALTH_2016_PID,                   0x00,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (Late 2016)",                 DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_STEALTH_LATE_2016_PID,              0x00,   0x01,   0x02);
 REGISTER_HID_DETECTOR_IPU("Razer Blade Stealth (2017)",                      DetectRazerControllers,        RAZER_VID,  RAZER_BLADE_STEALTH_2017_PID,                   0x00,   0x01,   0x02);
diff --git a/Controllers/RazerController/RazerDevices.h b/Controllers/RazerController/RazerDevices.h
index a5accb3c..1230410a 100644
--- a/Controllers/RazerController/RazerDevices.h
+++ b/Controllers/RazerController/RazerDevices.h
@@ -50,6 +50,8 @@
 #define RAZER_BLADE_PRO_2017_FULLHD_PID                 0x022F
 #define RAZER_BLADE_PRO_2019_PID                        0x0234
 #define RAZER_BLADE_PRO_LATE_2019_PID                   0x024C
+#define RAZER_BLADE_PRO_17_2020_PID                     0x0256
+#define RAZER_BLADE_PRO_17_2021_PID                     0x0279
 
 #define RAZER_BLADE_STEALTH_2016_PID                    0x0205
 #define RAZER_BLADE_STEALTH_LATE_2016_PID               0x0220
@@ -3512,6 +3514,76 @@ static const razer_device blade_pro_late_2019_device =
     0
 };
 
+/*-------------------------------------------------------------*\
+|  Razer Blade Pro 17 (2020)                                    |
+|                                                               |
+|   Zone "Keyboard"                                             |
+|       Matrix                                                  |
+|       6 Rows, 16 Columns                                      |
+\*-------------------------------------------------------------*/
+static const razer_zone blade_pro_17_2020_zone =
+{
+    "Keyboard",
+    ZONE_TYPE_MATRIX,
+    6,
+    16
+};
+
+static const razer_device blade_pro_17_2020_device =
+{
+    "Razer Blade Pro 17 (2020)",
+    RAZER_BLADE_PRO_17_2020_PID,
+    DEVICE_TYPE_KEYBOARD,
+    true,
+    6,
+    16,
+    {
+        &blade_pro_17_2020_zone,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL
+    },
+    NULL,
+    0
+};
+
+/*-------------------------------------------------------------*\
+|  Razer Blade Pro 17 (2021)                                    |
+|                                                               |
+|   Zone "Keyboard"                                             |
+|       Matrix                                                  |
+|       6 Rows, 16 Columns                                      |
+\*-------------------------------------------------------------*/
+static const razer_zone blade_pro_17_2021_zone =
+{
+    "Keyboard",
+    ZONE_TYPE_MATRIX,
+    6,
+    16
+};
+
+static const razer_device blade_pro_17_2021_device =
+{
+    "Razer Blade Pro 17 (2021)",
+    RAZER_BLADE_PRO_17_2021_PID,
+    DEVICE_TYPE_KEYBOARD,
+    true,
+    6,
+    16,
+    {
+        &blade_pro_17_2021_zone,
+        NULL,
+        NULL,
+        NULL,
+        NULL,
+        NULL
+    },
+    NULL,
+    0
+};
+
 /*-------------------------------------------------------------*\
 |  Razer Blade Stealth (2016)                                   |
 |                                                               |
@@ -6764,6 +6836,8 @@ static const razer_device* device_list[] =
     &blade_pro_2017_fullhd_device,
     &blade_pro_2019_device,
     &blade_pro_late_2019_device,
+    &blade_pro_17_2020_device,
+    &blade_pro_17_2021_device,
     &blade_stealth_2019_device,
     &blade_stealth_2016_device,
     &blade_stealth_late_2016_device,