diff --git a/rootfs/usr/share/inputplumber/capability_maps/onexplayer_type7.yaml b/rootfs/usr/share/inputplumber/capability_maps/onexplayer_type7.yaml
new file mode 100644
index 00000000..a45035f4
--- /dev/null
+++ b/rootfs/usr/share/inputplumber/capability_maps/onexplayer_type7.yaml
@@ -0,0 +1,69 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/ShadowBlip/InputPlumber/main/rootfs/usr/share/inputplumber/schema/capability_map_v1.json
+# Schema version number
+version: 1
+
+# The type of configuration schema
+kind: CapabilityMap
+
+# Name for the device event map
+name: OneXPlayer Type 7
+
+# Unique identifier of the capability mapping
+id: oxp7
+
+# List of mapped events that are activated by a specific set of activation keys.
+mapping:
+  - name: Turbo
+    source_events:
+      - keyboard: KeyLeftCtrl
+      - keyboard: KeyLeftAlt
+      - keyboard: KeyLeftMeta
+    target_event:
+      gamepad:
+        button: QuickAccess
+  - name: KB (Short Press)
+    source_events:
+      - keyboard: KeyRightCtrl
+      - keyboard: KeyLeftMeta
+      - keyboard: KeyO
+    target_event:
+      gamepad:
+        button: Keyboard
+  - name: Orange Button (Short Press)
+    source_events:
+      - keyboard: KeyLeftMeta
+      - keyboard: KeyD
+    target_event:
+      gamepad:
+        button: Guide
+  - name: Orange Button (Long Press)
+    source_events:
+      - keyboard: KeyLeftMeta
+      - keyboard: KeyG
+    target_event:
+      gamepad:
+        button: QuickAccess2
+  - name: Turbo + Orange Button
+    source_events:
+      - keyboard: KeyLeftMeta
+      - keyboard: KeySysrq
+    target_event:
+      gamepad:
+        button: Screenshot
+  - name: KB + Orange Button
+    source_events:
+      - keyboard: KeyRightCtrl
+      - keyboard: KeyRightAlt
+      - keyboard: KeyDelete
+    target_event:
+      keyboard: KeyF13
+  - name: M2
+    source_events:
+      - gamepad:
+          button: Guide
+    target_event:
+      gamepad:
+        button: RightPaddle1
+
+# List of events to filter from the source devices
+filtered_events: []
diff --git a/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly.yaml b/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly.yaml
index 374ab3af..bba0cc3c 100644
--- a/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly.yaml
+++ b/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly.yaml
@@ -18,6 +18,15 @@ matches:
   - dmi_data:
       product_name: ONEXPLAYER F1
       sys_vendor: ONE-NETBOOK
+  - dmi_data:
+      product_name: ONEXPLAYER F1 EVA-01
+      sys_vendor: ONE-NETBOOK
+  - dmi_data:
+      product_name: ONEXPLAYER F1 OLED
+      sys_vendor: ONE-NETBOOK
+  - dmi_data:
+      product_name: ONEXPLAYER F1Pro
+      sys_vendor: ONE-NETBOOK
 
 # One or more source devices to combine into a single virtual device. The events
 # from these devices will be watched and translated according to the key map.
@@ -27,6 +36,11 @@ source_devices:
       name: Microsoft X-Box 360 pad
       phys_path: usb-0000:c4:00.3-4/input0
       handler: event*
+  - group: gamepad
+    evdev:
+      name: Microsoft X-Box 360 pad
+      phys_path: usb-0000:c7:00.0-4/input0
+      handler: event*
   - group: keyboard
     evdev:
       name: AT Translated Set 2 keyboard
@@ -50,4 +64,4 @@ target_devices:
   - keyboard
 
 # The ID of a device event mapping in the 'event_maps' folder
-capability_map_id: oxp3
+capability_map_id: oxp7
diff --git a/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly_pro.yaml b/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly_pro.yaml
deleted file mode 100644
index 82a52d2f..00000000
--- a/rootfs/usr/share/inputplumber/devices/50-onexplayer_onexfly_pro.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-# yaml-language-server: $schema=https://raw.githubusercontent.com/ShadowBlip/InputPlumber/main/rootfs/usr/share/inputplumber/schema/composite_device_v1.json
-# Schema version number
-version: 1
-
-# The type of configuration schema
-kind: CompositeDevice
-
-# Name of the composite device mapping
-name: ONEXPLAYER ONEXFLY Pro
-
-# Only allow a single source device per composite device of this type.
-single_source: false
-
-# Only use this profile if *any* of the given matches matches. If this list is
-# empty, then the source devices will *always* be checked.
-# /sys/class/dmi/id/product_name
-matches:
-  - dmi_data:
-      product_name: ONEXPLAYER F1Pro
-      sys_vendor: ONE-NETBOOK
-
-# One or more source devices to combine into a single virtual device. The events
-# from these devices will be watched and translated according to the key map.
-source_devices:
-  - group: gamepad
-    evdev:
-      name: Microsoft X-Box 360 pad
-      phys_path: usb-0000:c7:00.0-4/input0
-      handler: event*
-  - group: keyboard
-    evdev:
-      name: AT Translated Set 2 keyboard
-      phys_path: isa0060/serio0/input0
-      handler: event*
-  - group: imu
-    iio:
-      name: i2c-BMI0160:00
-
-# Optional configuration for the composite device
-options:
-  # If true, InputPlumber will automatically try to manage the input device. If
-  # this is false, InputPlumber will not try to manage the device unless an
-  # external service enables management of the device. Defaults to 'false'
-  auto_manage: true
-
-# The target input device(s) to emulate by default
-target_devices:
-  - xbox-series
-  - mouse
-  - keyboard
-
-# The ID of a device event mapping in the 'event_maps' folder
-capability_map_id: oxp3