diff --git a/Controllers/RazerController/RazerDevices.cpp b/Controllers/RazerController/RazerDevices.cpp
index 2cdbd13b..ae6a00f3 100644
--- a/Controllers/RazerController/RazerDevices.cpp
+++ b/Controllers/RazerController/RazerDevices.cpp
@@ -11,29 +11,6 @@
 /*-------------------------------------------------------------------------*\
 |  KEYMAPS                                                                  |
 \*-------------------------------------------------------------------------*/
-keyboard_keymap_overlay_values razer_empty_layout
-{
-    KEYBOARD_SIZE::KEYBOARD_SIZE_EMPTY,
-    {
-        {   /* ANSI Value set not used */   },
-        {
-            /* Add more regional layout fixes here */
-        }
-    },
-    {
-        /*---------------------------------------------------------------------*\
-        | Insert Keys                                                           |
-        |   Zone,   Row,    Column,     Index,      Key                         |
-        \*---------------------------------------------------------------------*/
-    },
-    {
-        /*---------------------------------------------------------------------*\
-        | Swap Keys                                                             |
-        |   Zone,   Row,    Column,     Index,      Key                         |
-        \*---------------------------------------------------------------------*/
-    }
-};
-
 keyboard_keymap_overlay_values razer_blackwidow_layout
 {
     KEYBOARD_SIZE::KEYBOARD_SIZE_FULL,
@@ -3040,7 +3017,7 @@ static const razer_device blackwidow_chroma_device =
     },
     blackwidow_chroma_keymap,
     BLACKWIDOW_CHROMA_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3076,7 +3053,7 @@ static const razer_device blackwidow_chroma_overwatch_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3112,7 +3089,7 @@ static const razer_device blackwidow_v3_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3148,7 +3125,7 @@ static const razer_device blackwidow_chroma_te_device =
     },
     blackwidow_chroma_te_keymap,
     BLACKWIDOW_CHROMA_TE_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3184,7 +3161,7 @@ static const razer_device blackwidow_elite_device =
     },
     blackwidow_elite_keymap,
     BLACKWIDOW_ELITE_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3220,7 +3197,7 @@ static const razer_device blackwidow_chroma_v2_device =
     },
     blackwidow_chroma_v2_keymap,
     BLACKWIDOW_CHROMA_V2_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3256,7 +3233,7 @@ static const razer_device blackwidow_v3_pro_wired_device =
     },
     blackwidow_v3_pro_keymap,
     BLACKWIDOW_V3_PRO_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3292,7 +3269,7 @@ static const razer_device blackwidow_v3_pro_bluetooth_device =
     },
     blackwidow_v3_pro_keymap,
     BLACKWIDOW_V3_PRO_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3328,7 +3305,7 @@ static const razer_device blackwidow_v3_pro_wireless_device =
     },
     blackwidow_v3_pro_keymap,
     BLACKWIDOW_V3_PRO_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3364,7 +3341,7 @@ static const razer_device blackwidow_v3_tkl_device =
     },
     blackwidow_v3_tkl_keymap,
     BLACKWIDOW_V3_TKL_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3400,7 +3377,7 @@ static const razer_device blackwidow_v3_mini_wired_device =
     },
     blackwidow_v3_mini_keymap,
     BLACKWIDOW_V3_MINI_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3428,7 +3405,7 @@ static const razer_device blackwidow_v3_mini_wireless_device =
     },
     blackwidow_v3_mini_keymap,
     BLACKWIDOW_V3_MINI_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3464,7 +3441,7 @@ static const razer_device blackwidow_x_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3536,7 +3513,7 @@ static const razer_device cynosa_chroma_device =
     },
     cynosa_chroma_keymap,
     CYNOSA_CHROMA_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3572,7 +3549,7 @@ static const razer_device cynosa_v2_device =
     },
     cynosa_chroma_v2_keymap,
     CYNOSA_CHROMA_V2_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3608,7 +3585,7 @@ static const razer_device cynosa_lite_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3644,7 +3621,7 @@ static const razer_device ornata_chroma_device =
     },
     ornata_chroma_keymap,
     ORNATA_CHROMA_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 
@@ -3681,7 +3658,7 @@ static const razer_device ornata_v3_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 
@@ -3718,7 +3695,7 @@ static const razer_device ornata_v3_x_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 
@@ -3755,7 +3732,7 @@ static const razer_device deathstalker_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3899,7 +3876,7 @@ static const razer_device huntsman_device =
     },
     huntsman_keymap,
     HUNTSMAN_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -3995,7 +3972,7 @@ static const razer_device huntsman_v2_analog_device =
     },
     huntsman_v2_analog_keymap,
     HUNTSMAN_V2_ANALOG_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4031,7 +4008,7 @@ static const razer_device huntsman_mini_device =
     },
     huntsman_mini_keymap,
     HUNTSMAN_MINI_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4067,7 +4044,7 @@ static const razer_device huntsman_te_device =
     },
     huntsman_te_keymap,
     HUNTSMAN_TE_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4103,7 +4080,7 @@ static const razer_device huntsman_v2_tkl_device =
     },
     huntsman_v2_tkl_keymap,
     HUNTSMAN_V2_TKL_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4139,7 +4116,7 @@ static const razer_device huntsman_v2_device =
     },
     huntsman_v2_keymap,
     HUNTSMAN_V2_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -4179,7 +4156,7 @@ static const razer_device blade_2016_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4215,7 +4192,7 @@ static const razer_device blade_late_2016_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4251,7 +4228,7 @@ static const razer_device blade_15_2018_advanced_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4287,7 +4264,7 @@ static const razer_device blade_15_2018_base_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4323,7 +4300,7 @@ static const razer_device blade_15_2018_mercury_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4359,7 +4336,7 @@ static const razer_device blade_15_2019_advanced_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4395,7 +4372,7 @@ static const razer_device blade_15_2019_base_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4431,7 +4408,7 @@ static const razer_device blade_15_2019_mercury_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4467,7 +4444,7 @@ static const razer_device blade_15_2019_studio_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4503,7 +4480,7 @@ static const razer_device blade_15_2020_advanced_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4539,7 +4516,7 @@ static const razer_device blade_15_2020_base_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4575,7 +4552,7 @@ static const razer_device blade_late_2020_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4611,7 +4588,7 @@ static const razer_device blade_15_2021_advanced_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4647,7 +4624,7 @@ static const razer_device blade_15_2021_base_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4683,7 +4660,7 @@ static const razer_device blade_15_2021_base_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4755,7 +4732,7 @@ static const razer_device blade_14_2021_device =
     },
     blade_14_2021_keymap,
     BLADE_14_2021_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4791,7 +4768,7 @@ static const razer_device blade_14_2022_device =
     },
     blade_14_2022_keymap,
     BLADE_14_2022_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4863,7 +4840,7 @@ static const razer_device book_13_2020_device =
     },
     book_13_2020_keymap,
     BOOK_13_2020_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4899,7 +4876,7 @@ static const razer_device blade_pro_2016_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4935,7 +4912,7 @@ static const razer_device blade_pro_2017_device =
     },
     blade_pro_2017_keymap,
     BLADE_PRO_2017_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -4971,7 +4948,7 @@ static const razer_device blade_pro_2017_fullhd_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5006,7 +4983,7 @@ static const razer_device blade_pro_2019_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5042,7 +5019,7 @@ static const razer_device blade_pro_late_2019_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5078,7 +5055,7 @@ static const razer_device blade_pro_17_2020_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5114,7 +5091,7 @@ static const razer_device blade_pro_17_2021_device =
     },
     blade_17_pro_2021_keymap,
     BLADE_17_PRO_2021_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5150,7 +5127,7 @@ static const razer_device blade_stealth_2016_device =
     },
     blade_stealth_2016_keymap,
     BLADE_STEALTH_2016_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5186,7 +5163,7 @@ static const razer_device blade_stealth_late_2016_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5222,7 +5199,7 @@ static const razer_device blade_stealth_2017_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5258,7 +5235,7 @@ static const razer_device blade_stealth_late_2017_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5294,7 +5271,7 @@ static const razer_device blade_stealth_2019_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5330,7 +5307,7 @@ static const razer_device blade_stealth_late_2019_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5366,7 +5343,7 @@ static const razer_device blade_stealth_2020_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5402,7 +5379,7 @@ static const razer_device blade_stealth_late_2020_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -5442,7 +5419,7 @@ static const razer_device abyssus_elite_dva_edition_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5478,7 +5455,7 @@ static const razer_device abyssus_essential_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5526,7 +5503,7 @@ static const razer_device basilisk_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5562,7 +5539,7 @@ static const razer_device basilisk_essential_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5634,7 +5611,7 @@ static const razer_device basilisk_ultimate_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5706,7 +5683,7 @@ static const razer_device basilisk_ultimate_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5754,7 +5731,7 @@ static const razer_device basilisk_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5814,7 +5791,7 @@ static const razer_device basilisk_v3_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5874,7 +5851,7 @@ static const razer_device basilisk_v3_pro_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5934,7 +5911,7 @@ static const razer_device basilisk_v3_pro_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -5994,7 +5971,7 @@ static const razer_device basilisk_v3_pro_bluetooth_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 /*-------------------------------------------------------------*\
 |  Razer DeathAdder Chroma                                      |
@@ -6041,7 +6018,7 @@ static const razer_device deathadder_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6089,7 +6066,7 @@ static const razer_device deathadder_elite_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6137,7 +6114,7 @@ static const razer_device deathadder_essential_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6185,7 +6162,7 @@ static const razer_device deathadder_essential_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6233,7 +6210,7 @@ static const razer_device deathadder_essential_white_edition_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6281,7 +6258,7 @@ static const razer_device deathadder_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6317,7 +6294,7 @@ static const razer_device deathadder_v2_mini_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6353,7 +6330,7 @@ static const razer_device deathadder_v2_pro_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6389,7 +6366,7 @@ static const razer_device deathadder_v2_pro_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6449,7 +6426,7 @@ static const razer_device diamondback_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6521,7 +6498,7 @@ static const razer_device lancehead_2017_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6593,7 +6570,7 @@ static const razer_device lancehead_2017_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6665,7 +6642,7 @@ static const razer_device lancehead_2019_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6737,7 +6714,7 @@ static const razer_device lancehead_2019_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6809,7 +6786,7 @@ static const razer_device lancehead_te_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6845,7 +6822,7 @@ static const razer_device mamba_2012_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6881,7 +6858,7 @@ static const razer_device mamba_2012_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6917,7 +6894,7 @@ static const razer_device mamba_2015_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -6953,7 +6930,7 @@ static const razer_device mamba_2015_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7001,7 +6978,7 @@ static const razer_device mamba_2018_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7050,7 +7027,7 @@ static const razer_device mamba_2018_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7123,7 +7100,7 @@ static const razer_device mamba_elite_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7195,7 +7172,7 @@ static const razer_device mamba_te_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7255,7 +7232,7 @@ static const razer_device naga_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7315,7 +7292,7 @@ static const razer_device naga_classic_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7375,7 +7352,7 @@ static const razer_device naga_hex_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7435,7 +7412,7 @@ static const razer_device naga_left_handed_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7495,7 +7472,7 @@ static const razer_device naga_trinity_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7555,7 +7532,7 @@ static const razer_device naga_pro_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 static const razer_device naga_pro_wireless_device =
@@ -7576,7 +7553,7 @@ static const razer_device naga_pro_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7612,7 +7589,7 @@ static const razer_device viper_8khz_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7648,7 +7625,7 @@ static const razer_device viper_mini_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7684,7 +7661,7 @@ static const razer_device viper_ultimate_wired_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7720,7 +7697,7 @@ static const razer_device viper_ultimate_wireless_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7756,7 +7733,7 @@ static const razer_device viper_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7804,7 +7781,7 @@ static const razer_device naga_epic_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -7844,7 +7821,7 @@ static const razer_device orbweaver_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7880,7 +7857,7 @@ static const razer_device tartarus_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7929,7 +7906,7 @@ static const razer_device tartarus_pro_device =
     \*-------------------------------------------------------------*/
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -7965,7 +7942,7 @@ static const razer_device tartarus_v2_device =
     },
     tartarus_v2_keymap,
     TARTARUS_V2_KEYMAP_SIZE,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -8005,7 +7982,7 @@ static const razer_device firefly_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8041,7 +8018,7 @@ static const razer_device firefly_hyperflux_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8077,7 +8054,7 @@ static const razer_device firefly_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8113,7 +8090,7 @@ static const razer_device goliathus_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8149,7 +8126,7 @@ static const razer_device goliathus_extended_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8185,7 +8162,7 @@ static const razer_device strider_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -8225,7 +8202,7 @@ static const razer_device kraken_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8261,7 +8238,7 @@ static const razer_device kraken_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8297,7 +8274,7 @@ static const razer_device kraken_ultimate_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8333,7 +8310,7 @@ static const razer_device kraken_kitty_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8393,7 +8370,7 @@ static const razer_device tiamat_71_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\
@@ -8445,7 +8422,7 @@ static const razer_device core_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8493,7 +8470,7 @@ static const razer_device core_x_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8529,7 +8506,7 @@ static const razer_device mug_holder_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8625,7 +8602,7 @@ static const razer_device chromaargb_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8697,7 +8674,7 @@ static const razer_device chromahdk_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8745,7 +8722,7 @@ static const razer_device chroma_pc_case_lighting_kit_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8781,7 +8758,7 @@ static const razer_device base_station_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 
@@ -8818,7 +8795,7 @@ static const razer_device mouse_bungee_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8854,7 +8831,7 @@ static const razer_device base_station_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8890,7 +8867,7 @@ static const razer_device laptop_stand_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8926,7 +8903,7 @@ static const razer_device laptop_stand_chroma_v2_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8962,7 +8939,7 @@ static const razer_device mouse_dock_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -8998,7 +8975,7 @@ static const razer_device mouse_dock_pro_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9047,7 +9024,7 @@ static const razer_device nommo_pro_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9096,7 +9073,7 @@ static const razer_device nommo_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9133,7 +9110,7 @@ static const razer_device charging_pad_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9170,7 +9147,7 @@ static const razer_device o11_dynamic_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9207,7 +9184,7 @@ static const razer_device seiren_emote_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------*\
@@ -9244,7 +9221,7 @@ static const razer_device thunderbolt_4_dock_chroma_device =
     },
     NULL,
     0,
-    &razer_empty_layout
+    NULL
 };
 
 /*-------------------------------------------------------------------------*\