antonpup · xQwexx · Nov 30, 2020 · Nov 30, 2020
diff --git a/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs b/Project-Aurora/Project-Aurora/ConfigUI.xaml.cs
@@ -143,7 +143,7 @@ private void Layer_manager_NewLayer(Layer layer)
 
         private void KbLayout_KeyboardLayoutUpdated(object sender)
         {
-            virtial_kb = Global.kbLayout.Virtual_keyboard;
+            virtial_kb = Global.kbLayout.VirtualDevicesLayout;
 
             keyboard_grid.Children.Clear();
             keyboard_grid.Children.Add(virtial_kb);
@@ -182,7 +182,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
             current_color = desktop_color_scheme;
             bg_grid.Background = new SolidColorBrush(Color.FromRgb(desktop_color_scheme.Red, desktop_color_scheme.Green, desktop_color_scheme.Blue));
 
-            virtial_kb = Global.kbLayout.Virtual_keyboard;
+            virtial_kb = Global.kbLayout.VirtualDevicesLayout;
 
             keyboard_grid.Children.Clear();
             keyboard_grid.Children.Add(virtial_kb);

diff --git a/...Features/images/Asus_Pugio_backlights.png → ...eLayouts/Images/Asus_Pugio_backlights.png b/...Features/images/Asus_Pugio_backlights.png → ...eLayouts/Images/Asus_Pugio_backlights.png
diff --git a/...Extra Features/images/Asus_Pugio_body.png → .../DeviceLayouts/Images/Asus_Pugio_body.png b/...Extra Features/images/Asus_Pugio_body.png → .../DeviceLayouts/Images/Asus_Pugio_body.png
diff --git a/...Extra Features/images/Asus_Pugio_logo.png → .../DeviceLayouts/Images/Asus_Pugio_logo.png b/...Extra Features/images/Asus_Pugio_logo.png → .../DeviceLayouts/Images/Asus_Pugio_logo.png
diff --git a/...xtra Features/images/Asus_Pugio_wheel.png → ...DeviceLayouts/Images/Asus_Pugio_wheel.png b/...xtra Features/images/Asus_Pugio_wheel.png → ...DeviceLayouts/Images/Asus_Pugio_wheel.png
diff --git a/...youts/Extra Features/images/Asus_logo.png → ...Aurora/DeviceLayouts/Images/Asus_logo.png b/...youts/Extra Features/images/Asus_logo.png → ...Aurora/DeviceLayouts/Images/Asus_logo.png
diff --git a/...ra Features/images/Corsair_Katar_logo.png → ...viceLayouts/Images/Corsair_Katar_logo.png b/...ra Features/images/Corsair_Katar_logo.png → ...viceLayouts/Images/Corsair_Katar_logo.png
diff --git a/...Features/images/Corsair_Katar_outline.png → ...eLayouts/Images/Corsair_Katar_outline.png b/...Features/images/Corsair_Katar_outline.png → ...eLayouts/Images/Corsair_Katar_outline.png
diff --git a/...xtra Features/images/Corsair_M65_logo.png → ...DeviceLayouts/Images/Corsair_M65_logo.png b/...xtra Features/images/Corsair_M65_logo.png → ...DeviceLayouts/Images/Corsair_M65_logo.png
diff --git a/...a Features/images/Corsair_M65_outline.png → ...iceLayouts/Images/Corsair_M65_outline.png b/...a Features/images/Corsair_M65_outline.png → ...iceLayouts/Images/Corsair_M65_outline.png
diff --git a/...atures/images/Corsair_M65_scrollwheel.png → ...ayouts/Images/Corsair_M65_scrollwheel.png b/...atures/images/Corsair_M65_scrollwheel.png → ...ayouts/Images/Corsair_M65_scrollwheel.png
diff --git a/...ts/Extra Features/images/Corsair_logo.png → ...ora/DeviceLayouts/Images/Corsair_logo.png b/...ts/Extra Features/images/Corsair_logo.png → ...ora/DeviceLayouts/Images/Corsair_logo.png
diff --git a/...a Features/images/Corsair_strafe_logo.png → ...iceLayouts/Images/Corsair_strafe_logo.png b/...a Features/images/Corsair_strafe_logo.png → ...iceLayouts/Images/Corsair_strafe_logo.png
diff --git a/...atures/images/Corsair_strafe_mk2_logo.png → ...ayouts/Images/Corsair_strafe_mk2_logo.png b/...atures/images/Corsair_strafe_mk2_logo.png → ...ayouts/Images/Corsair_strafe_mk2_logo.png
diff --git a/...s/Extra Features/images/Logi_G502_dpi.png → ...ra/DeviceLayouts/Images/Logi_G502_dpi.png b/...s/Extra Features/images/Logi_G502_dpi.png → ...ra/DeviceLayouts/Images/Logi_G502_dpi.png
diff --git a/.../Extra Features/images/Logi_G502_logo.png → ...a/DeviceLayouts/Images/Logi_G502_logo.png b/.../Extra Features/images/Logi_G502_logo.png → ...a/DeviceLayouts/Images/Logi_G502_logo.png
diff --git a/...tra Features/images/Logi_G502_outline.png → ...eviceLayouts/Images/Logi_G502_outline.png b/...tra Features/images/Logi_G502_outline.png → ...eviceLayouts/Images/Logi_G502_outline.png
diff --git a/.../Extra Features/images/Logi_G810_logo.png → ...a/DeviceLayouts/Images/Logi_G810_logo.png b/.../Extra Features/images/Logi_G810_logo.png → ...a/DeviceLayouts/Images/Logi_G810_logo.png
diff --git a/.../Extra Features/images/Logi_G900_logo.png → ...a/DeviceLayouts/Images/Logi_G900_logo.png b/.../Extra Features/images/Logi_G900_logo.png → ...a/DeviceLayouts/Images/Logi_G900_logo.png
diff --git a/...tra Features/images/Logi_G900_outline.png → ...eviceLayouts/Images/Logi_G900_outline.png b/...tra Features/images/Logi_G900_outline.png → ...eviceLayouts/Images/Logi_G900_outline.png
diff --git a/...Extra Features/images/Logi_G910_badge.png → .../DeviceLayouts/Images/Logi_G910_badge.png b/...Extra Features/images/Logi_G910_badge.png → .../DeviceLayouts/Images/Logi_G910_badge.png
diff --git a/.../Extra Features/images/Logi_G910_logo.png → ...a/DeviceLayouts/Images/Logi_G910_logo.png b/.../Extra Features/images/Logi_G910_logo.png → ...a/DeviceLayouts/Images/Logi_G910_logo.png
diff --git a/...s/Extra Features/images/Logi_g900_dpi.png → ...ra/DeviceLayouts/Images/Logi_g900_dpi.png b/...s/Extra Features/images/Logi_g900_dpi.png → ...ra/DeviceLayouts/Images/Logi_g900_dpi.png
diff --git a/...youts/Extra Features/images/Omen_logo.png → ...Aurora/DeviceLayouts/Images/Omen_logo.png b/...youts/Extra Features/images/Omen_logo.png → ...Aurora/DeviceLayouts/Images/Omen_logo.png
diff --git a/...uts/Extra Features/images/Omen_zone_0.png → ...rora/DeviceLayouts/Images/Omen_zone_0.png b/...uts/Extra Features/images/Omen_zone_0.png → ...rora/DeviceLayouts/Images/Omen_zone_0.png
diff --git a/...uts/Extra Features/images/Omen_zone_1.png → ...rora/DeviceLayouts/Images/Omen_zone_1.png b/...uts/Extra Features/images/Omen_zone_1.png → ...rora/DeviceLayouts/Images/Omen_zone_1.png
diff --git a/...uts/Extra Features/images/Omen_zone_2.png → ...rora/DeviceLayouts/Images/Omen_zone_2.png b/...uts/Extra Features/images/Omen_zone_2.png → ...rora/DeviceLayouts/Images/Omen_zone_2.png
diff --git a/...uts/Extra Features/images/Omen_zone_3.png → ...rora/DeviceLayouts/Images/Omen_zone_3.png b/...uts/Extra Features/images/Omen_zone_3.png → ...rora/DeviceLayouts/Images/Omen_zone_3.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L1.png → ...eviceLayouts/Images/Razer_Mamba_TE_L1.png b/...tra Features/images/Razer_Mamba_TE_L1.png → ...eviceLayouts/Images/Razer_Mamba_TE_L1.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L2.png → ...eviceLayouts/Images/Razer_Mamba_TE_L2.png b/...tra Features/images/Razer_Mamba_TE_L2.png → ...eviceLayouts/Images/Razer_Mamba_TE_L2.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L3.png → ...eviceLayouts/Images/Razer_Mamba_TE_L3.png b/...tra Features/images/Razer_Mamba_TE_L3.png → ...eviceLayouts/Images/Razer_Mamba_TE_L3.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L4.png → ...eviceLayouts/Images/Razer_Mamba_TE_L4.png b/...tra Features/images/Razer_Mamba_TE_L4.png → ...eviceLayouts/Images/Razer_Mamba_TE_L4.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L5.png → ...eviceLayouts/Images/Razer_Mamba_TE_L5.png b/...tra Features/images/Razer_Mamba_TE_L5.png → ...eviceLayouts/Images/Razer_Mamba_TE_L5.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L6.png → ...eviceLayouts/Images/Razer_Mamba_TE_L6.png b/...tra Features/images/Razer_Mamba_TE_L6.png → ...eviceLayouts/Images/Razer_Mamba_TE_L6.png
diff --git a/...tra Features/images/Razer_Mamba_TE_L7.png → ...eviceLayouts/Images/Razer_Mamba_TE_L7.png b/...tra Features/images/Razer_Mamba_TE_L7.png → ...eviceLayouts/Images/Razer_Mamba_TE_L7.png
diff --git a/...a Features/images/Razer_Mamba_TE_Logo.png → ...iceLayouts/Images/Razer_Mamba_TE_Logo.png b/...a Features/images/Razer_Mamba_TE_Logo.png → ...iceLayouts/Images/Razer_Mamba_TE_Logo.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R1.png → ...eviceLayouts/Images/Razer_Mamba_TE_R1.png b/...tra Features/images/Razer_Mamba_TE_R1.png → ...eviceLayouts/Images/Razer_Mamba_TE_R1.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R2.png → ...eviceLayouts/Images/Razer_Mamba_TE_R2.png b/...tra Features/images/Razer_Mamba_TE_R2.png → ...eviceLayouts/Images/Razer_Mamba_TE_R2.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R3.png → ...eviceLayouts/Images/Razer_Mamba_TE_R3.png b/...tra Features/images/Razer_Mamba_TE_R3.png → ...eviceLayouts/Images/Razer_Mamba_TE_R3.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R4.png → ...eviceLayouts/Images/Razer_Mamba_TE_R4.png b/...tra Features/images/Razer_Mamba_TE_R4.png → ...eviceLayouts/Images/Razer_Mamba_TE_R4.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R5.png → ...eviceLayouts/Images/Razer_Mamba_TE_R5.png b/...tra Features/images/Razer_Mamba_TE_R5.png → ...eviceLayouts/Images/Razer_Mamba_TE_R5.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R6.png → ...eviceLayouts/Images/Razer_Mamba_TE_R6.png b/...tra Features/images/Razer_Mamba_TE_R6.png → ...eviceLayouts/Images/Razer_Mamba_TE_R6.png
diff --git a/...tra Features/images/Razer_Mamba_TE_R7.png → ...eviceLayouts/Images/Razer_Mamba_TE_R7.png b/...tra Features/images/Razer_Mamba_TE_R7.png → ...eviceLayouts/Images/Razer_Mamba_TE_R7.png
diff --git a/...es/images/Razer_Mamba_TE_Scroll_Wheel.png → ...ts/Images/Razer_Mamba_TE_Scroll_Wheel.png b/...es/images/Razer_Mamba_TE_Scroll_Wheel.png → ...ts/Images/Razer_Mamba_TE_Scroll_Wheel.png
diff --git a/...eatures/images/Razer_Mamba_TE_outline.png → ...Layouts/Images/Razer_Mamba_TE_outline.png b/...eatures/images/Razer_Mamba_TE_outline.png → ...Layouts/Images/Razer_Mamba_TE_outline.png
diff --git a/...outs/Extra Features/images/Razer_logo.png → ...urora/DeviceLayouts/Images/Razer_logo.png b/...outs/Extra Features/images/Razer_logo.png → ...urora/DeviceLayouts/Images/Razer_logo.png
diff --git a/...Features/images/Roccat_Kone_Pure_logo.png → ...eLayouts/Images/Roccat_Kone_Pure_logo.png b/...Features/images/Roccat_Kone_Pure_logo.png → ...eLayouts/Images/Roccat_Kone_Pure_logo.png
diff --git a/...tures/images/Roccat_Kone_Pure_outline.png → ...youts/Images/Roccat_Kone_Pure_outline.png b/...tures/images/Roccat_Kone_Pure_outline.png → ...youts/Images/Roccat_Kone_Pure_outline.png
diff --git a/...ra Features/images/Sabre_front_lights.png → ...viceLayouts/Images/Sabre_front_lights.png b/...ra Features/images/Sabre_front_lights.png → ...viceLayouts/Images/Sabre_front_lights.png
diff --git a/...s/Extra Features/images/Sabre_outline.png → ...ra/DeviceLayouts/Images/Sabre_outline.png b/...s/Extra Features/images/Sabre_outline.png → ...ra/DeviceLayouts/Images/Sabre_outline.png
diff --git a/...tra Features/images/Sabre_scrollwheel.png → ...eviceLayouts/Images/Sabre_scrollwheel.png b/...tra Features/images/Sabre_scrollwheel.png → ...eviceLayouts/Images/Sabre_scrollwheel.png
diff --git a/...ra Features/images/SoundBlasterX_logo.png → ...viceLayouts/Images/SoundBlasterX_logo.png b/...ra Features/images/SoundBlasterX_logo.png → ...viceLayouts/Images/SoundBlasterX_logo.png
diff --git a/...Features/images/SteelSeries_Apex_logo.png → ...eLayouts/Images/SteelSeries_Apex_logo.png b/...Features/images/SteelSeries_Apex_logo.png → ...eLayouts/Images/SteelSeries_Apex_logo.png
diff --git a/...res/images/SteelSeries_Rival_300_logo.png → ...uts/Images/SteelSeries_Rival_300_logo.png b/...res/images/SteelSeries_Rival_300_logo.png → ...uts/Images/SteelSeries_Rival_300_logo.png
diff --git a/.../images/SteelSeries_Rival_300_outline.png → .../Images/SteelSeries_Rival_300_outline.png b/.../images/SteelSeries_Rival_300_outline.png → .../Images/SteelSeries_Rival_300_outline.png
diff --git a/...ges/SteelSeries_Rival_300_scrollwheel.png → ...ges/SteelSeries_Rival_300_scrollwheel.png b/...ges/SteelSeries_Rival_300_scrollwheel.png → ...ges/SteelSeries_Rival_300_scrollwheel.png
diff --git a/... Features/images/omen_outpost_outline.png → ...ceLayouts/Images/omen_outpost_outline.png b/... Features/images/omen_outpost_outline.png → ...ceLayouts/Images/omen_outpost_outline.png
diff --git a/...ages/omen_outpost_plus_photon_outline.png → ...ages/omen_outpost_plus_photon_outline.png b/...ages/omen_outpost_plus_photon_outline.png → ...ages/omen_outpost_plus_photon_outline.png
diff --git a/...a Features/images/omen_photon_outline.png → ...iceLayouts/Images/omen_photon_outline.png b/...a Features/images/omen_photon_outline.png → ...iceLayouts/Images/omen_photon_outline.png
diff --git a/...atures/images/omen_photon_scrollwheel.png → ...ayouts/Images/omen_photon_scrollwheel.png b/...atures/images/omen_photon_scrollwheel.png → ...ayouts/Images/omen_photon_scrollwheel.png
diff --git a/...a Features/images/omen_sequencer_logo.png → ...iceLayouts/Images/omen_sequencer_logo.png b/...a Features/images/omen_sequencer_logo.png → ...iceLayouts/Images/omen_sequencer_logo.png
diff --git a/...images/omen_vector_essentials_outline.png → ...Images/omen_vector_essentials_outline.png b/...images/omen_vector_essentials_outline.png → ...Images/omen_vector_essentials_outline.png
diff --git a/...xtra Features/images/omen_vector_logo.png → ...DeviceLayouts/Images/omen_vector_logo.png b/...xtra Features/images/omen_vector_logo.png → ...DeviceLayouts/Images/omen_vector_logo.png
diff --git a/...a Features/images/omen_vector_outline.png → ...iceLayouts/Images/omen_vector_outline.png b/...a Features/images/omen_vector_outline.png → ...iceLayouts/Images/omen_vector_outline.png
diff --git a/...a Features/asus_strix_flare_features.json → ...a Features/asus_strix_flare_features.json b/...a Features/asus_strix_flare_features.json → ...a Features/asus_strix_flare_features.json
diff --git a/.../cooler_master_sk650_bottom_features.json → .../cooler_master_sk650_bottom_features.json b/.../cooler_master_sk650_bottom_features.json → .../cooler_master_sk650_bottom_features.json
diff --git a/...es/cooler_master_sk650_left_features.json → ...es/cooler_master_sk650_left_features.json b/...es/cooler_master_sk650_left_features.json → ...es/cooler_master_sk650_left_features.json
diff --git a/...s/cooler_master_sk650_right_features.json → ...s/cooler_master_sk650_right_features.json b/...s/cooler_master_sk650_right_features.json → ...s/cooler_master_sk650_right_features.json
diff --git a/...res/cooler_master_sk650_top_features.json → ...res/cooler_master_sk650_top_features.json b/...res/cooler_master_sk650_top_features.json → ...res/cooler_master_sk650_top_features.json
diff --git a/... Features/corsair_k65_right_features.json → ... Features/corsair_k65_right_features.json b/... Features/corsair_k65_right_features.json → ... Features/corsair_k65_right_features.json
diff --git a/... Features/corsair_k68_right_features.json → ... Features/corsair_k68_right_features.json b/... Features/corsair_k68_right_features.json → ... Features/corsair_k68_right_features.json
diff --git a/...ra Features/corsair_k70_mk2_features.json → ...ra Features/corsair_k70_mk2_features.json b/...ra Features/corsair_k70_mk2_features.json → ...ra Features/corsair_k70_mk2_features.json
diff --git a/...a Features/corsair_k95_left_features.json → ...a Features/corsair_k95_left_features.json b/...a Features/corsair_k95_left_features.json → ...a Features/corsair_k95_left_features.json
diff --git a/... Features/corsair_k95_right_features.json → ... Features/corsair_k95_right_features.json b/... Features/corsair_k95_right_features.json → ... Features/corsair_k95_right_features.json
diff --git a/...eatures/corsair_strafe_left_features.json → ...eatures/corsair_strafe_left_features.json b/...eatures/corsair_strafe_left_features.json → ...eatures/corsair_strafe_left_features.json
diff --git a/...res/corsair_strafe_mk2_left_features.json → ...res/corsair_strafe_mk2_left_features.json b/...res/corsair_strafe_mk2_left_features.json → ...res/corsair_strafe_mk2_left_features.json
diff --git a/...es/corsair_strafe_mk2_right_features.json → ...es/corsair_strafe_mk2_right_features.json b/...es/corsair_strafe_mk2_right_features.json → ...es/corsair_strafe_mk2_right_features.json
diff --git a/...atures/corsair_strafe_right_features.json → ...atures/corsair_strafe_right_features.json b/...atures/corsair_strafe_right_features.json → ...atures/corsair_strafe_right_features.json
diff --git a/...ures/drevo_blademaster_left_features.json → ...ures/drevo_blademaster_left_features.json b/...ures/drevo_blademaster_left_features.json → ...ures/drevo_blademaster_left_features.json
diff --git a/...xtra Features/ducky_shine_7_features.json → ...xtra Features/ducky_shine_7_features.json b/...xtra Features/ducky_shine_7_features.json → ...xtra Features/ducky_shine_7_features.json
diff --git a/...ures/hyperx_alloy_elite_rgb_features.json → ...ures/hyperx_alloy_elite_rgb_features.json b/...ures/hyperx_alloy_elite_rgb_features.json → ...ures/hyperx_alloy_elite_rgb_features.json
diff --git a/...xtra Features/logitech_gpro_features.json → ...xtra Features/logitech_g810_features.json b/...xtra Features/logitech_gpro_features.json → ...xtra Features/logitech_g810_features.json
diff --git a/...xtra Features/logitech_g815_features.json → ...xtra Features/logitech_g815_features.json b/...xtra Features/logitech_g815_features.json → ...xtra Features/logitech_g815_features.json
diff --git a/...xtra Features/logitech_g910_features.json → ...xtra Features/logitech_g910_features.json b/...xtra Features/logitech_g910_features.json → ...xtra Features/logitech_g910_features.json
@@ -1,157 +1,157 @@
-{
-  "group_tag": "keyboard",
-  "origin_region": 1,
-  "grouped_keys": [
-    {
-      "visualName": "G6",
-      "tag": 113,
-      "margin_left": 62.0,
-      "margin_top": -37.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": 5,
-      "margin_top_bits": -3,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G7",
-      "tag": 114,
-      "margin_left": 99.0,
-      "margin_top": -37.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": 8,
-      "margin_top_bits": -3,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G8",
-      "tag": 115,
-      "margin_left": 136.0,
-      "margin_top": -37.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": 11,
-      "margin_top_bits": -3,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G9",
-      "tag": 116,
-      "margin_left": 173.0,
-      "margin_top": -37.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": 14,
-      "margin_top_bits": -3,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "LOGO",
-      "tag": 128,
-      "margin_left": -45.0,
-      "margin_top": 0.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 9.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 0,
-      "image": "Logi_G910_logo.png",
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G1",
-      "tag": 108,
-      "margin_left": -45.0,
-      "margin_top": 37.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 3,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G2",
-      "tag": 109,
-      "margin_left": -45.0,
-      "margin_top": 74.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 6,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G3",
-      "tag": 110,
-      "margin_left": -45.0,
-      "margin_top": 111.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 9,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G4",
-      "tag": 111,
-      "margin_left": -45.0,
-      "margin_top": 148.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 12,
-      "enabled": true,
-      "absolute_location": true
-    },
-    {
-      "visualName": "G5",
-      "tag": 112,
-      "margin_left": -45.0,
-      "margin_top": 185.0,
-      "width": 30.0,
-      "height": 30.0,
-      "font_size": 12.0,
-      "width_bits": 3,
-      "height_bits": 3,
-      "margin_left_bits": -4,
-      "margin_top_bits": 15,
-      "enabled": true,
-      "absolute_location": true
-    }
-  ]
+{
+  "group_tag": "keyboard",
+  "origin_region": 1,
+  "grouped_keys": [
+    {
+      "visualName": "G6",
+      "tag": 113,
+      "margin_left": 62.0,
+      "margin_top": -37.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": 5,
+      "margin_top_bits": -3,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G7",
+      "tag": 114,
+      "margin_left": 99.0,
+      "margin_top": -37.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": 8,
+      "margin_top_bits": -3,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G8",
+      "tag": 115,
+      "margin_left": 136.0,
+      "margin_top": -37.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": 11,
+      "margin_top_bits": -3,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G9",
+      "tag": 116,
+      "margin_left": 173.0,
+      "margin_top": -37.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": 14,
+      "margin_top_bits": -3,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "LOGO",
+      "tag": 128,
+      "margin_left": -45.0,
+      "margin_top": 0.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 9.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 0,
+      "image": "Logi_G910_logo.png",
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G1",
+      "tag": 108,
+      "margin_left": -45.0,
+      "margin_top": 37.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 3,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G2",
+      "tag": 109,
+      "margin_left": -45.0,
+      "margin_top": 74.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 6,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G3",
+      "tag": 110,
+      "margin_left": -45.0,
+      "margin_top": 111.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 9,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G4",
+      "tag": 111,
+      "margin_left": -45.0,
+      "margin_top": 148.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 12,
+      "enabled": true,
+      "absolute_location": true
+    },
+    {
+      "visualName": "G5",
+      "tag": 112,
+      "margin_left": -45.0,
+      "margin_top": 185.0,
+      "width": 30.0,
+      "height": 30.0,
+      "font_size": 12.0,
+      "width_bits": 3,
+      "height_bits": 3,
+      "margin_left_bits": -4,
+      "margin_top_bits": 15,
+      "enabled": true,
+      "absolute_location": true
+    }
+  ]
 }
diff --git a/...s/logitech_g910_left_bottom_features.json → ...s/logitech_g910_left_bottom_features.json b/...s/logitech_g910_left_bottom_features.json → ...s/logitech_g910_left_bottom_features.json
@@ -1,22 +1,22 @@
-{
-  "group_tag": "keyboard",
-  "origin_region": 3,
-  "grouped_keys": [
-    {
-      "visualName": "BADGE",
-      "tag": 129,
-      "margin_left": 92.5,
-      "margin_top": 0.0,
-      "width": 79.0,
-      "height": 10.0,
-      "font_size": 9.0,
-      "width_bits": 8,
-      "height_bits": 1,
-      "margin_left_bits": 8,
-      "margin_top_bits": 0,
-      "image": "Logi_G910_badge.png",
-      "enabled": true,
-      "absolute_location": true
-    }
-  ]
+{
+  "group_tag": "keyboard",
+  "origin_region": 3,
+  "grouped_keys": [
+    {
+      "visualName": "BADGE",
+      "tag": 129,
+      "margin_left": 92.5,
+      "margin_top": 0.0,
+      "width": 79.0,
+      "height": 10.0,
+      "font_size": 9.0,
+      "width_bits": 8,
+      "height_bits": 1,
+      "margin_left_bits": 8,
+      "margin_top_bits": 0,
+      "image": "Logi_G910_badge.png",
+      "enabled": true,
+      "absolute_location": true
+    }
+  ]
 }