diff --git a/hwdb.d/20-dmi-id.hwdb b/hwdb.d/20-dmi-id.hwdb
index 46b34c38fda..a5761e5e99e 100644
--- a/hwdb.d/20-dmi-id.hwdb
+++ b/hwdb.d/20-dmi-id.hwdb
@@ -83,3 +83,10 @@ dmi:bvnAmericanMegatrendsInternational*:rvnGPD:rnG1628-04*
 # Google Pixelbook (Eve) is a convertible, but reports chassis type 3 (Desktop)
 dmi:*:svnGoogle:pnEve:*
  ID_CHASSIS=convertible
+
+# Supermicro servers report "Super Server" as the system product name,
+# which is meaningless. The real model lives on the base board (DMI type 2).
+dmi:*:svnSupermicro:pnSuper Server:*
+dmi:*:svnSupermicro:pnSuperServer:*
+ ID_PRODUCT_NAME_IS_RUBBISH=1
+ ID_PRODUCT_VERSION_IS_RUBBISH=1
diff --git a/hwdb.d/60-evdev.hwdb b/hwdb.d/60-evdev.hwdb
index 5a7077c0823..d4e5da2e44f 100644
--- a/hwdb.d/60-evdev.hwdb
+++ b/hwdb.d/60-evdev.hwdb
@@ -75,6 +75,11 @@ evdev:input:b0003v08CAp0020*
  EVDEV_ABS_00=::20
  EVDEV_ABS_01=::20
 
+# APT-USB-3 (sold as Trust TB-3100), 200x150 mm active area
+evdev:input:b0003v08CAp0021*
+ EVDEV_ABS_00=::15
+ EVDEV_ABS_01=::15
+
 # AIPTEK Media Tablet Ultimate (detected as Waltop International Corp. Batteryless Tablet)
 evdev:input:b0003v172Fp0503*
  EVDEV_ABS_00=::160
@@ -1018,6 +1023,15 @@ evdev:input:b0003v2FEBp0006*
  EVDEV_ABS_00=::129
  EVDEV_ABS_01=::215
 
+#########################################
+# ViewSonic
+#########################################
+
+# ViewSonic WoodPad 7 PF0730-E0WW
+evdev:input:b0003v0543pE667*
+ EVDEV_ABS_00=::103
+ EVDEV_ABS_01=::105
+
 #########################################
 # Waltop
 #########################################
diff --git a/hwdb.d/60-input-id.hwdb b/hwdb.d/60-input-id.hwdb
index a5ef4804197..d1fb2dab0c1 100644
--- a/hwdb.d/60-input-id.hwdb
+++ b/hwdb.d/60-input-id.hwdb
@@ -81,6 +81,11 @@ id-input:modalias:input:b0003v1781p0898*
 id-input:modalias:input:b0003v342DpE483*
  ID_INPUT_JOYSTICK=0
 
+# K809 Bluetooth keyboard
+id-input:bluetooth:v0957p0007:name:K809 Keyboard:*
+ ID_INPUT_TABLET=0
+ ID_INPUT_TABLET_PAD=0
+
 # XP-PEN STAR 06
 id-input:modalias:input:b0003v28bdp0078*
  ID_INPUT_TABLET=1
@@ -93,8 +98,11 @@ id-input:modalias:input:b0005v045Ep0B22e0517*
 id-input:modalias:input:b0003v04B3p301Ee0100-e0,1,2,4*
  ID_INPUT_POINTINGSTICK=1
 
-# Logitech G502 X Lightspeed (wired); the macro/G-key interface is not a keyboard
+# Logitech gaming mice (wired); the macro/G-key interface is not a keyboard
+# G502 X Lightspeed
 id-input:modalias:input:b0003v046DpC098e0111-e0,1,2,3,*
+# PRO X3 SUPERSTRIKE
+id-input:modalias:input:b0003v046DpC0A9e0111-e0,1,2,3,*
  ID_INPUT_KEYBOARD=0
 
 # Logitech G915 TKL Keyboard (Bluetooth)
@@ -118,6 +126,11 @@ id-input:modalias:input:b0003v068Ep00F2*
  ID_INPUT_ACCELEROMETER=0
  ID_INPUT_JOYSTICK=1
 
+# Thrustmaster T.Pendular Rudder
+id-input:modalias:input:b0003v044FpB68F*
+ ID_INPUT_ACCELEROMETER=0
+ ID_INPUT_JOYSTICK=1
+
 # TEX Shinobi Trackpoint
 id-input:modalias:input:b0003v04D9p0407e0111-e0,1,2,4*
  ID_INPUT_POINTINGSTICK=1
diff --git a/hwdb.d/60-keyboard.hwdb b/hwdb.d/60-keyboard.hwdb
index 07102a3a16b..f44dba0d945 100644
--- a/hwdb.d/60-keyboard.hwdb
+++ b/hwdb.d/60-keyboard.hwdb
@@ -294,6 +294,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnAquarius*:pnCmp*NS483*:*
 ###########################################################
 
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnASUS:pn*:*
+ KEYBOARD_KEY_76=reserved				# F24 -> ignore
  KEYBOARD_KEY_ed=volumeup
  KEYBOARD_KEY_ee=volumedown
  KEYBOARD_KEY_ef=mute
@@ -727,8 +728,9 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnHewlett-Packard*:pn*[pP][aA][vV][iI][lL][iI][oO
  KEYBOARD_KEY_d9=unknown
  KEYBOARD_KEY_d2=sysrq                                  # Fn+Print = SYSRQ
 
-# Pavilion gaming 15-dk1* (lid keys)
+# Pavilion gaming 15-dk* (lid keys)
 evdev:atkbd:dmi:bvn*:bvr*:bd*:br*:efr*:svnHP:pnHPPavilionGamingLaptop15-dk1*:*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:br*:efr*:svnHP:pnHPPavilionGamingLaptop15-dk0*:*
  KEYBOARD_KEY_d7=unknown
  KEYBOARD_KEY_d8=unknown
 
@@ -1119,6 +1121,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn0769AP2:pvr3000N200:*
 
 # Lenovo ThinkPad T14 Gen 1 AMD, Brazilian keyboard
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn20UES5TQ00:pvr*
+# Lenovo ThinkPad X1 Carbon 6th Gen, Brazilian keyboard
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn20KGS37329:pvr*
  KEYBOARD_KEY_9d=ro                                     # slash/question key
 
 # Lenovo IdeaPad
@@ -1257,6 +1261,8 @@ evdev:input:b0003v17EFp60C[368]*-e0,1,4,k*,F0,*ram4,lsfw
 
 # Lenovo Thinkbook 16 G6+ 2024
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn21LG:pvr*
+# Lenovo ThinkBook 16 G7+ 2025
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnLENOVO:pn21TL:pvr*
  KEYBOARD_KEY_0a=!9
  KEYBOARD_KEY_0b=!0
 
@@ -1714,6 +1720,7 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMICRO-STAR*:pnU90/U100:*
 # Keymaps MSI Prestige And MSI Modern FnKeys and Special keys
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*Prestige*:*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*Modern*:*
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*Stealth*14*:*
  KEYBOARD_KEY_76=touchpad_toggle                        # Toggle touchpad, sends meta+ctrl+toggle
  KEYBOARD_KEY_91=prog1                                  # Fn+F7 Creation Center, sometime F7
  KEYBOARD_KEY_f2=rotate_display                         # Fn+F12 Screen rotation
@@ -1727,6 +1734,10 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pn*Modern*:*
 evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pnModern15HAIC1MG:*
  KEYBOARD_KEY_d7=bluetooth                              # Fn+F6 Bluetooth key
 
+# Keymaps for MSI Modern 15 B13M
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnMicro-Star*:pnModern15B13M:*
+ KEYBOARD_KEY_c0=camera                                 # Fn+F6 Webcam toggle
+
 # MSI Claw A1M, MSI Claw 7 AI+ A2VM, MSI Claw 8 AI+ A2VM, MSI Claw A8 BZ2EM
 evdev:name:AT Translated Set 2 keyboard:dmi:*:rvnMicro-StarInternationalCo.,Ltd.:rnMS-1T41:*
 evdev:name:AT Translated Set 2 keyboard:dmi:*:rvnMicro-StarInternationalCo.,Ltd.:rnMS-1T42:*
@@ -1833,6 +1844,20 @@ evdev:name:AT Translated Set 2 keyboard:phys:sp/serio*/input*:ev:120013:*
  KEYBOARD_KEY_e7=btn_west
  KEYBOARD_KEY_e8=btn_east
 
+###########################################################
+# OneXPlayer
+###########################################################
+
+# OneXPlayer 3
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnONE-NETBOOK*:pnONEXPLAYER3:pvr*
+ KEYBOARD_KEY_ae=!volumedown
+ KEYBOARD_KEY_b0=!volumeup
+
+# OneXPlayer X2 Mini (G3E)
+evdev:atkbd:dmi:bvn*:bvr*:bd*:svnONE-NETBOOK*:pnONEXPLAYERX2Mini:pvr*
+ KEYBOARD_KEY_ae=!volumedown
+ KEYBOARD_KEY_b0=!volumeup
+
 ###########################################################
 # Onkyo
 ###########################################################