diff --git a/packages/sysutils/v4l-utils/keymaps/beelink b/packages/sysutils/v4l-utils/keymaps/beelink
deleted file mode 100644
index cf905b1994..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/beelink
+++ /dev/null
@@ -1,29 +0,0 @@
-# table beelink_x2, type: NEC
-0x804d KEY_MUTE
-0x8009 KEY_MEDIA
-0x8011 KEY_AUDIO
-0x8054 KEY_WWW
-0x804e KEY_VOLUMEUP
-0x80bb KEY_REWIND
-0x80bd KEY_FORWARD
-0x8056 KEY_VOLUMEDOWN
-0x8053 KEY_HOME
-0x801b KEY_BACK
-0x8026 KEY_UP
-0x8025 KEY_LEFT
-0x800d KEY_OK
-0x8027 KEY_RIGHT
-0x8028 KEY_DOWN
-0x8049 KEY_MENU
-0x8030 KEY_NUMERIC_0
-0x8031 KEY_NUMERIC_1
-0x8032 KEY_NUMERIC_2
-0x8033 KEY_NUMERIC_3
-0x8034 KEY_NUMERIC_4
-0x8035 KEY_NUMERIC_5
-0x8036 KEY_NUMERIC_6
-0x8037 KEY_NUMERIC_7
-0x8038 KEY_NUMERIC_8
-0x8039 KEY_NUMERIC_9
-0x8044 KEY_BACKSPACE
-0x8051 KEY_POWER
diff --git a/packages/sysutils/v4l-utils/keymaps/beelink.toml b/packages/sysutils/v4l-utils/keymaps/beelink.toml
new file mode 100644
index 0000000000..f8c3d844a4
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/beelink.toml
@@ -0,0 +1,32 @@
+[[protocols]]
+name = "beelink_x2"
+protocol = "NEC"
+[protocols.scancodes]
+0x804d = "KEY_MUTE"
+0x8009 = "KEY_MEDIA"
+0x8011 = "KEY_AUDIO"
+0x8054 = "KEY_WWW"
+0x804e = "KEY_VOLUMEUP"
+0x80bb = "KEY_REWIND"
+0x80bd = "KEY_FORWARD"
+0x8056 = "KEY_VOLUMEDOWN"
+0x8053 = "KEY_HOME"
+0x801b = "KEY_BACK"
+0x8026 = "KEY_UP"
+0x8025 = "KEY_LEFT"
+0x800d = "KEY_OK"
+0x8027 = "KEY_RIGHT"
+0x8028 = "KEY_DOWN"
+0x8049 = "KEY_MENU"
+0x8030 = "KEY_NUMERIC_0"
+0x8031 = "KEY_NUMERIC_1"
+0x8032 = "KEY_NUMERIC_2"
+0x8033 = "KEY_NUMERIC_3"
+0x8034 = "KEY_NUMERIC_4"
+0x8035 = "KEY_NUMERIC_5"
+0x8036 = "KEY_NUMERIC_6"
+0x8037 = "KEY_NUMERIC_7"
+0x8038 = "KEY_NUMERIC_8"
+0x8039 = "KEY_NUMERIC_9"
+0x8044 = "KEY_BACKSPACE"
+0x8051 = "KEY_POWER"
diff --git a/packages/sysutils/v4l-utils/keymaps/cubox_i b/packages/sysutils/v4l-utils/keymaps/cubox_i
deleted file mode 100644
index e23b3f19a3..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/cubox_i
+++ /dev/null
@@ -1,10 +0,0 @@
-# table cubox_i, type: RC6
-0x1f020b0 KEY_MEDIA
-0x1f02078 KEY_UP
-0x1f02044 KEY_ENTER
-0x1f020f8 KEY_DOWN
-0x1f02004 KEY_LEFT
-0x1f02084 KEY_RIGHT
-0x1f020c4 KEY_BACKSPACE
-0x1f02068 KEY_PLAYPAUSE
-0x1f02064 KEY_EPG
diff --git a/packages/sysutils/v4l-utils/keymaps/cubox_i.toml b/packages/sysutils/v4l-utils/keymaps/cubox_i.toml
new file mode 100644
index 0000000000..12f2b0af12
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/cubox_i.toml
@@ -0,0 +1,13 @@
+[[protocols]]
+name = "cubox_i"
+protocol = "rc6"
+[protocols.scancodes]
+0x1f020b0 = "KEY_MEDIA"
+0x1f02078 = "KEY_UP"
+0x1f02044 = "KEY_ENTER"
+0x1f020f8 = "KEY_DOWN"
+0x1f02004 = "KEY_LEFT"
+0x1f02084 = "KEY_RIGHT"
+0x1f020c4 = "KEY_BACKSPACE"
+0x1f02068 = "KEY_PLAYPAUSE"
+0x1f02064 = "KEY_EPG"
diff --git a/packages/sysutils/v4l-utils/keymaps/khadas_vim b/packages/sysutils/v4l-utils/keymaps/khadas_vim
deleted file mode 100644
index 485e4ccb55..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/khadas_vim
+++ /dev/null
@@ -1,13 +0,0 @@
-# table kvim, type: NEC
-0x14 KEY_POWER
-0x07 KEY_OK
-0x03 KEY_UP
-0x02 KEY_DOWN
-0x0e KEY_LEFT
-0x1a KEY_RIGHT
-0x13 KEY_MENU
-0x01 KEY_BACK
-0x0b KEY_VOLUMEUP
-0x58 KEY_VOLUMEDOWN
-0x48 KEY_HOME
-0x5b KEY_CONTEXT_MENU
diff --git a/packages/sysutils/v4l-utils/keymaps/khadas_vim.toml b/packages/sysutils/v4l-utils/keymaps/khadas_vim.toml
new file mode 100644
index 0000000000..10fb6a2280
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/khadas_vim.toml
@@ -0,0 +1,16 @@
+[[protocols]]
+name = "Khadas VIM"
+protocol = "nec"
+[protocols.scancodes]
+0x14 = "KEY_POWER"
+0x07 = "KEY_OK"
+0x03 = "KEY_UP"
+0x02 = "KEY_DOWN"
+0x0e = "KEY_LEFT"
+0x1a = "KEY_RIGHT"
+0x13 = "KEY_MENU"
+0x01 = "KEY_BACK"
+0x0b = "KEY_VOLUMEUP"
+0x58 = "KEY_VOLUMEDOWN"
+0x48 = "KEY_HOME"
+0x5b = "KEY_CONTEXT_MENU"
diff --git a/packages/sysutils/v4l-utils/keymaps/minix_neo b/packages/sysutils/v4l-utils/keymaps/minix_neo
deleted file mode 100644
index 00ffdb27aa..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/minix_neo
+++ /dev/null
@@ -1,13 +0,0 @@
-# table minix_neo, type: NEC
-0x118 KEY_POWER
-0x146 KEY_UP
-0x116 KEY_DOWN
-0x147 KEY_LEFT
-0x115 KEY_RIGHT
-0x155 KEY_ENTER
-0x110 KEY_VOLUMEDOWN
-0x140 KEY_BACK
-0x114 KEY_VOLUMEUP
-0x10d KEY_HOMEPAGE
-0x104 KEY_MENU
-0x112 KEY_CONFIG
diff --git a/packages/sysutils/v4l-utils/keymaps/minix_neo.toml b/packages/sysutils/v4l-utils/keymaps/minix_neo.toml
new file mode 100644
index 0000000000..045c3d96dd
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/minix_neo.toml
@@ -0,0 +1,16 @@
+[[protocols]]
+name = "Minix Neo"
+protocol = "nec"
+[protocols.scancodes]
+0x118 = "KEY_POWER"
+0x146 = "KEY_UP"
+0x116 = "KEY_DOWN"
+0x147 = "KEY_LEFT"
+0x115 = "KEY_RIGHT"
+0x155 = "KEY_ENTER"
+0x110 = "KEY_VOLUMEDOWN"
+0x140 = "KEY_BACK"
+0x114 = "KEY_VOLUMEUP"
+0x10d = "KEY_HOMEPAGE"
+0x104 = "KEY_MENU"
+0x112 = "KEY_CONFIG"
diff --git a/packages/sysutils/v4l-utils/keymaps/odroid b/packages/sysutils/v4l-utils/keymaps/odroid
deleted file mode 100644
index 49d7a17f11..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/odroid
+++ /dev/null
@@ -1,13 +0,0 @@
-# table odroid, type: NEC
-0xb2dc KEY_POWER
-0xb288 KEY_MUTE
-0xb282 KEY_HOME
-0xb2ce KEY_OK
-0xb2ca KEY_UP
-0xb299 KEY_LEFT
-0xb2c1 KEY_RIGHT
-0xb2d2 KEY_DOWN
-0xb2c5 KEY_MENU
-0xb29a KEY_BACK
-0xb281 KEY_VOLUMEDOWN
-0xb280 KEY_VOLUMEUP
diff --git a/packages/sysutils/v4l-utils/keymaps/odroid.toml b/packages/sysutils/v4l-utils/keymaps/odroid.toml
new file mode 100644
index 0000000000..1580e7459a
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/odroid.toml
@@ -0,0 +1,16 @@
+[[protocols]]
+name = "odroid"
+protocol = "nec"
+[protocols.scancodes]
+0xb2dc = "KEY_POWER"
+0xb288 = "KEY_MUTE"
+0xb282 = "KEY_HOME"
+0xb2ce = "KEY_OK"
+0xb2ca = "KEY_UP"
+0xb299 = "KEY_LEFT"
+0xb2c1 = "KEY_RIGHT"
+0xb2d2 = "KEY_DOWN"
+0xb2c5 = "KEY_MENU"
+0xb29a = "KEY_BACK"
+0xb281 = "KEY_VOLUMEDOWN"
+0xb280 = "KEY_VOLUMEUP"
diff --git a/packages/sysutils/v4l-utils/keymaps/pine64 b/packages/sysutils/v4l-utils/keymaps/pine64
deleted file mode 100644
index 267d73167b..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/pine64
+++ /dev/null
@@ -1,26 +0,0 @@
-# table pine64, type: NEC
-0x404000 KEY_NUMERIC_0
-0x404001 KEY_NUMERIC_1
-0x404002 KEY_NUMERIC_2
-0x404003 KEY_NUMERIC_3
-0x404004 KEY_NUMERIC_4
-0x404005 KEY_NUMERIC_5
-0x404006 KEY_NUMERIC_6
-0x404007 KEY_NUMERIC_7
-0x404008 KEY_NUMERIC_8
-0x404009 KEY_NUMERIC_9
-0x40400a KEY_MUTE
-0x40400b KEY_UP
-0x40400c KEY_BACKSPACE
-0x40400d KEY_OK
-0x40400e KEY_DOWN
-0x404010 KEY_LEFT
-0x404011 KEY_RIGHT
-0x404017 KEY_VOLUMEDOWN
-0x404018 KEY_VOLUMEUP
-0x40401a KEY_HOME
-0x40401d KEY_MENU
-0x40401f KEY_WWW
-0x404045 KEY_BACK
-0x404047 KEY_INFO
-0x40404d KEY_POWER
diff --git a/packages/sysutils/v4l-utils/keymaps/pine64.toml b/packages/sysutils/v4l-utils/keymaps/pine64.toml
new file mode 100644
index 0000000000..0b0a8c377c
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/pine64.toml
@@ -0,0 +1,29 @@
+[[protocols]]
+name = "pine64"
+protocol = "NEC"
+[protocols.scancodes]
+0x404000 = "KEY_NUMERIC_0"
+0x404001 = "KEY_NUMERIC_1"
+0x404002 = "KEY_NUMERIC_2"
+0x404003 = "KEY_NUMERIC_3"
+0x404004 = "KEY_NUMERIC_4"
+0x404005 = "KEY_NUMERIC_5"
+0x404006 = "KEY_NUMERIC_6"
+0x404007 = "KEY_NUMERIC_7"
+0x404008 = "KEY_NUMERIC_8"
+0x404009 = "KEY_NUMERIC_9"
+0x40400a = "KEY_MUTE"
+0x40400b = "KEY_UP"
+0x40400c = "KEY_BACKSPACE"
+0x40400d = "KEY_OK"
+0x40400e = "KEY_DOWN"
+0x404010 = "KEY_LEFT"
+0x404011 = "KEY_RIGHT"
+0x404017 = "KEY_VOLUMEDOWN"
+0x404018 = "KEY_VOLUMEUP"
+0x40401a = "KEY_HOME"
+0x40401d = "KEY_MENU"
+0x40401f = "KEY_WWW"
+0x404045 = "KEY_BACK"
+0x404047 = "KEY_INFO"
+0x40404d = "KEY_POWER"
diff --git a/packages/sysutils/v4l-utils/keymaps/wetek_hub b/packages/sysutils/v4l-utils/keymaps/wetek_hub
deleted file mode 100644
index 67fe25fc3d..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/wetek_hub
+++ /dev/null
@@ -1,13 +0,0 @@
-# table wetek_hub, type: NEC
-0x77f1 KEY_POWER
-0x77f2 KEY_HOME
-0x77f3 KEY_MUTE
-0x77f4 KEY_UP
-0x77f5 KEY_DOWN
-0x77f6 KEY_LEFT
-0x77f7 KEY_RIGHT
-0x77f8 KEY_OK
-0x77f9 KEY_BACK
-0x77fa KEY_MENU
-0x77fb KEY_VOLUMEUP
-0x77fc KEY_VOLUMEDOWN
diff --git a/packages/sysutils/v4l-utils/keymaps/wetek_hub.toml b/packages/sysutils/v4l-utils/keymaps/wetek_hub.toml
new file mode 100644
index 0000000000..89d8cf63d5
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/wetek_hub.toml
@@ -0,0 +1,16 @@
+[[protocols]]
+name = "Wetek Hub"
+protocol = "nec"
+[protocols.scancodes]
+0x77f1 = "KEY_POWER"
+0x77f2 = "KEY_HOME"
+0x77f3 = "KEY_MUTE"
+0x77f4 = "KEY_UP"
+0x77f5 = "KEY_DOWN"
+0x77f6 = "KEY_LEFT"
+0x77f7 = "KEY_RIGHT"
+0x77f8 = "KEY_OK"
+0x77f9 = "KEY_BACK"
+0x77fa = "KEY_MENU"
+0x77fb = "KEY_VOLUMEUP"
+0x77fc = "KEY_VOLUMEDOWN"
diff --git a/packages/sysutils/v4l-utils/keymaps/wetek_play_2 b/packages/sysutils/v4l-utils/keymaps/wetek_play_2
deleted file mode 100644
index 1aff5942cc..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/wetek_play_2
+++ /dev/null
@@ -1,44 +0,0 @@
-# table wetek_play_2, type: NEC
-0x5e5f02 KEY_POWER
-0x5e5f46 KEY_SLEEP
-0x5e5f10 KEY_MUTE
-0x5e5f22 KEY_1
-0x5e5f23 KEY_2
-0x5e5f24 KEY_3
-0x5e5f25 KEY_4
-0x5e5f26 KEY_5
-0x5e5f27 KEY_6
-0x5e5f28 KEY_7
-0x5e5f29 KEY_8
-0x5e5f30 KEY_9
-0x5e5f71 KEY_ESC
-0x5e5f21 KEY_0
-0x5e5f72 KEY_CAPSLOCK
-0x5e5f03 KEY_HOMEPAGE
-0x5e5f48 KEY_MENU
-0x5e5f61 KEY_BACKSPACE
-0x5e5f83 KEY_EPG
-0x5e5f84 KEY_COMPOSE
-0x5e5f77 KEY_CONFIG
-0x5e5f50 KEY_UP
-0x5e5f4b KEY_DOWN
-0x5e5f4c KEY_LEFT
-0x5e5f4d KEY_RIGHT
-0x5e5f47 KEY_ENTER
-0x5e5f44 KEY_VOLUMEUP
-0x5e5f43 KEY_VOLUMEDOWN
-0x5e5f41 KEY_PAGEUP
-0x5e5f42 KEY_PAGEDOWN
-0x5e5f4f KEY_FAVORITES
-0x5e5f82 KEY_TEXT
-0x5e5f73 KEY_RED
-0x5e5f74 KEY_GREEN
-0x5e5f75 KEY_YELLOW
-0x5e5f76 KEY_BLUE
-0x5e5f67 KEY_PREVIOUSSONG
-0x5e5f79 KEY_REWIND
-0x5e5f80 KEY_FASTFORWARD
-0x5e5f81 KEY_NEXTSONG
-0x5e5f04 KEY_RECORD
-0x5e5f2c KEY_PLAYPAUSE
-0x5e5f2b KEY_STOP
diff --git a/packages/sysutils/v4l-utils/keymaps/wetek_play_2.toml b/packages/sysutils/v4l-utils/keymaps/wetek_play_2.toml
new file mode 100644
index 0000000000..641041fb59
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/wetek_play_2.toml
@@ -0,0 +1,48 @@
+[[protocols]]
+name = "Wetek Play 2"
+protocol = "nec"
+variant = "necx"
+[protocols.scancodes]
+0x5e5f02 = "KEY_POWER"
+0x5e5f46 = "KEY_SLEEP"
+0x5e5f10 = "KEY_MUTE"
+0x5e5f22 = "KEY_1"
+0x5e5f23 = "KEY_2"
+0x5e5f24 = "KEY_3"
+0x5e5f25 = "KEY_4"
+0x5e5f26 = "KEY_5"
+0x5e5f27 = "KEY_6"
+0x5e5f28 = "KEY_7"
+0x5e5f29 = "KEY_8"
+0x5e5f30 = "KEY_9"
+0x5e5f71 = "KEY_ESC"
+0x5e5f21 = "KEY_0"
+0x5e5f72 = "KEY_CAPSLOCK"
+0x5e5f03 = "KEY_HOMEPAGE"
+0x5e5f48 = "KEY_MENU"
+0x5e5f61 = "KEY_BACKSPACE"
+0x5e5f83 = "KEY_EPG"
+0x5e5f84 = "KEY_COMPOSE"
+0x5e5f77 = "KEY_CONFIG"
+0x5e5f50 = "KEY_UP"
+0x5e5f4b = "KEY_DOWN"
+0x5e5f4c = "KEY_LEFT"
+0x5e5f4d = "KEY_RIGHT"
+0x5e5f47 = "KEY_ENTER"
+0x5e5f44 = "KEY_VOLUMEUP"
+0x5e5f43 = "KEY_VOLUMEDOWN"
+0x5e5f41 = "KEY_PAGEUP"
+0x5e5f42 = "KEY_PAGEDOWN"
+0x5e5f4f = "KEY_FAVORITES"
+0x5e5f82 = "KEY_TEXT"
+0x5e5f73 = "KEY_RED"
+0x5e5f74 = "KEY_GREEN"
+0x5e5f75 = "KEY_YELLOW"
+0x5e5f76 = "KEY_BLUE"
+0x5e5f67 = "KEY_PREVIOUSSONG"
+0x5e5f79 = "KEY_REWIND"
+0x5e5f80 = "KEY_FASTFORWARD"
+0x5e5f81 = "KEY_NEXTSONG"
+0x5e5f04 = "KEY_RECORD"
+0x5e5f2c = "KEY_PLAYPAUSE"
+0x5e5f2b = "KEY_STOP"
diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_360 b/packages/sysutils/v4l-utils/keymaps/xbox_360
deleted file mode 100644
index 66b62adc7d..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/xbox_360
+++ /dev/null
@@ -1,66 +0,0 @@
-# table xbox_360, type: RC6
-0x800f7400 KEY_NUMERIC_0
-0x800f7401 KEY_NUMERIC_1
-0x800f7402 KEY_NUMERIC_2
-0x800f7403 KEY_NUMERIC_3
-0x800f7404 KEY_NUMERIC_4
-0x800f7405 KEY_NUMERIC_5
-0x800f7406 KEY_NUMERIC_6
-0x800f7407 KEY_NUMERIC_7
-0x800f7408 KEY_NUMERIC_8
-0x800f7409 KEY_NUMERIC_9
-0x800f740a KEY_DELETE
-0x800f740b KEY_ENTER
-0x800f740c KEY_SLEEP
-0x800f740d KEY_MEDIA
-0x800f7464 KEY_MEDIA
-0x800f740e KEY_MUTE
-0x800f740f KEY_INFO
-0x800f7410 KEY_VOLUMEUP
-0x800f7411 KEY_VOLUMEDOWN
-0x800f7412 KEY_CHANNELUP
-0x800f746C KEY_CHANNELUP
-0x800f7413 KEY_CHANNELDOWN
-0x800f746D KEY_CHANNELDOWN
-0x800f7414 KEY_FASTFORWARD
-0x800f7415 KEY_REWIND
-0x800f7416 KEY_PLAY
-0x800f7417 KEY_RECORD
-0x800f7418 KEY_PAUSE
-0x800f7419 KEY_STOP
-0x800f741a KEY_NEXT
-0x800f741b KEY_PREVIOUS
-0x800f741c KEY_NUMERIC_POUND
-0x800f741d KEY_NUMERIC_STAR
-0x800f741e KEY_UP
-0x800f741f KEY_DOWN
-0x800f7420 KEY_LEFT
-0x800f7421 KEY_RIGHT
-0x800f7422 KEY_OK
-0x800f7423 KEY_EXIT
-0x800f7424 KEY_DVD
-0x800f744f KEY_EPG
-0x800f7427 KEY_ZOOM
-0x800f7432 KEY_MODE
-0x800f7433 KEY_PRESENTATION
-0x800f7428 KEY_EJECTCD
-0x800f743a KEY_BRIGHTNESSUP
-0x800f7446 KEY_TV
-0x800f7447 KEY_AUDIO
-0x800f7448 KEY_PVR
-0x800f7449 KEY_CAMERA
-0x800f744a KEY_VIDEO
-0x800f744c KEY_LANGUAGE
-0x800f7451 KEY_TITLE
-0x800f744e KEY_PRINT
-0x800f7450 KEY_RADIO
-0x800f745a KEY_SUBTITLE
-0x800f7425 KEY_RED
-0x800f7466 KEY_GREEN
-0x800f7426 KEY_YELLOW
-0x800f7468 KEY_BLUE
-0x800f7465 KEY_POWER2
-0x800f746e KEY_PLAYPAUSE
-0x800f746f KEY_PLAYER
-0x800f7480 KEY_BRIGHTNESSDOWN
-0x800f7481 KEY_PLAYPAUSE
diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_360.toml b/packages/sysutils/v4l-utils/keymaps/xbox_360.toml
new file mode 100644
index 0000000000..9ad76abef1
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/xbox_360.toml
@@ -0,0 +1,70 @@
+[[protocols]]
+name = "Xbox 360"
+protocol = "rc6"
+variant = "rc6_mce"
+[protocols.scancodes]
+0x800f7400 = "KEY_NUMERIC_0"
+0x800f7401 = "KEY_NUMERIC_1"
+0x800f7402 = "KEY_NUMERIC_2"
+0x800f7403 = "KEY_NUMERIC_3"
+0x800f7404 = "KEY_NUMERIC_4"
+0x800f7405 = "KEY_NUMERIC_5"
+0x800f7406 = "KEY_NUMERIC_6"
+0x800f7407 = "KEY_NUMERIC_7"
+0x800f7408 = "KEY_NUMERIC_8"
+0x800f7409 = "KEY_NUMERIC_9"
+0x800f740a = "KEY_DELETE"
+0x800f740b = "KEY_ENTER"
+0x800f740c = "KEY_SLEEP"
+0x800f740d = "KEY_MEDIA"
+0x800f7464 = "KEY_MEDIA"
+0x800f740e = "KEY_MUTE"
+0x800f740f = "KEY_INFO"
+0x800f7410 = "KEY_VOLUMEUP"
+0x800f7411 = "KEY_VOLUMEDOWN"
+0x800f7412 = "KEY_CHANNELUP"
+0x800f746C = "KEY_CHANNELUP"
+0x800f7413 = "KEY_CHANNELDOWN"
+0x800f746D = "KEY_CHANNELDOWN"
+0x800f7414 = "KEY_FASTFORWARD"
+0x800f7415 = "KEY_REWIND"
+0x800f7416 = "KEY_PLAY"
+0x800f7417 = "KEY_RECORD"
+0x800f7418 = "KEY_PAUSE"
+0x800f7419 = "KEY_STOP"
+0x800f741a = "KEY_NEXT"
+0x800f741b = "KEY_PREVIOUS"
+0x800f741c = "KEY_NUMERIC_POUND"
+0x800f741d = "KEY_NUMERIC_STAR"
+0x800f741e = "KEY_UP"
+0x800f741f = "KEY_DOWN"
+0x800f7420 = "KEY_LEFT"
+0x800f7421 = "KEY_RIGHT"
+0x800f7422 = "KEY_OK"
+0x800f7423 = "KEY_EXIT"
+0x800f7424 = "KEY_DVD"
+0x800f744f = "KEY_EPG"
+0x800f7427 = "KEY_ZOOM"
+0x800f7432 = "KEY_MODE"
+0x800f7433 = "KEY_PRESENTATION"
+0x800f7428 = "KEY_EJECTCD"
+0x800f743a = "KEY_BRIGHTNESSUP"
+0x800f7446 = "KEY_TV"
+0x800f7447 = "KEY_AUDIO"
+0x800f7448 = "KEY_PVR"
+0x800f7449 = "KEY_CAMERA"
+0x800f744a = "KEY_VIDEO"
+0x800f744c = "KEY_LANGUAGE"
+0x800f7451 = "KEY_TITLE"
+0x800f744e = "KEY_PRINT"
+0x800f7450 = "KEY_RADIO"
+0x800f745a = "KEY_SUBTITLE"
+0x800f7425 = "KEY_RED"
+0x800f7466 = "KEY_GREEN"
+0x800f7426 = "KEY_YELLOW"
+0x800f7468 = "KEY_BLUE"
+0x800f7465 = "KEY_POWER2"
+0x800f746e = "KEY_PLAYPAUSE"
+0x800f746f = "KEY_PLAYER"
+0x800f7480 = "KEY_BRIGHTNESSDOWN"
+0x800f7481 = "KEY_PLAYPAUSE"
diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_one b/packages/sysutils/v4l-utils/keymaps/xbox_one
deleted file mode 100644
index 366a58c8f6..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/xbox_one
+++ /dev/null
@@ -1,22 +0,0 @@
-# table xbox_one, type: NEC
-0x80d864 KEY_MEDIA
-0x80d820 KEY_LEFT
-0x80d821 KEY_RIGHT
-0x80d81e KEY_UP
-0x80d81f KEY_DOWN
-0x80d822 KEY_OK
-0x80d823 KEY_EXIT
-0x80d80e KEY_MUTE
-0x80d810 KEY_VOLUMEUP
-0x80d811 KEY_VOLUMEDOWN
-0x80d812 KEY_CHANNELUP
-0x80d813 KEY_CHANNELDOWN
-0x80d814 KEY_FASTFORWARD
-0x80d815 KEY_REWIND
-0x80d870 KEY_PLAYPAUSE
-0x80d819 KEY_STOP
-0x80d81a KEY_NEXT
-0x80d81b KEY_PREVIOUS
-0x80d826 KEY_INFO
-0x80d86f KEY_EPG
-0x80d86e KEY_ZOOM
diff --git a/packages/sysutils/v4l-utils/keymaps/xbox_one.toml b/packages/sysutils/v4l-utils/keymaps/xbox_one.toml
new file mode 100644
index 0000000000..886ecb86fb
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/xbox_one.toml
@@ -0,0 +1,26 @@
+[[protocols]]
+name = "Xbox One"
+protocol = "nec"
+variant = "necx"
+[protocols.scancodes]
+0x80d864 = "KEY_MEDIA"
+0x80d820 = "KEY_LEFT"
+0x80d821 = "KEY_RIGHT"
+0x80d81e = "KEY_UP"
+0x80d81f = "KEY_DOWN"
+0x80d822 = "KEY_OK"
+0x80d823 = "KEY_EXIT"
+0x80d80e = "KEY_MUTE"
+0x80d810 = "KEY_VOLUMEUP"
+0x80d811 = "KEY_VOLUMEDOWN"
+0x80d812 = "KEY_CHANNELUP"
+0x80d813 = "KEY_CHANNELDOWN"
+0x80d814 = "KEY_FASTFORWARD"
+0x80d815 = "KEY_REWIND"
+0x80d870 = "KEY_PLAYPAUSE"
+0x80d819 = "KEY_STOP"
+0x80d81a = "KEY_NEXT"
+0x80d81b = "KEY_PREVIOUS"
+0x80d826 = "KEY_INFO"
+0x80d86f = "KEY_EPG"
+0x80d86e = "KEY_ZOOM"
diff --git a/packages/sysutils/v4l-utils/keymaps/zotac b/packages/sysutils/v4l-utils/keymaps/zotac
deleted file mode 100644
index 448d5cbb79..0000000000
--- a/packages/sysutils/v4l-utils/keymaps/zotac
+++ /dev/null
@@ -1,44 +0,0 @@
-# table zotac, type: RC6
-0x8034048e KEY_POWER
-0x8034043d KEY_SLEEP
-0x80340400 KEY_NUMERIC_0
-0x80340401 KEY_NUMERIC_1
-0x80340402 KEY_NUMERIC_2
-0x80340403 KEY_NUMERIC_3
-0x80340404 KEY_NUMERIC_4
-0x80340405 KEY_NUMERIC_5
-0x80340406 KEY_NUMERIC_6
-0x80340407 KEY_NUMERIC_7
-0x80340408 KEY_NUMERIC_8
-0x80340409 KEY_NUMERIC_9
-0x80340432 KEY_NUMERIC_POUND
-0x80340433 KEY_NUMERIC_STAR
-0x8034043a KEY_DELETE
-0x80340434 KEY_ENTER
-0x8034045d KEY_MEDIA
-0x8034040d KEY_MUTE
-0x803404cb KEY_INFO
-0x80340410 KEY_VOLUMEUP
-0x80340411 KEY_VOLUMEDOWN
-0x8034041e KEY_CHANNELUP
-0x8034041f KEY_CHANNELDOWN
-0x80340428 KEY_FASTFORWARD
-0x80340429 KEY_REWIND
-0x8034042c KEY_PLAY
-0x80340437 KEY_RECORD
-0x80340430 KEY_PAUSE
-0x80340431 KEY_STOP
-0x80340420 KEY_NEXT
-0x80340421 KEY_PREVIOUS
-0x80340458 KEY_UP
-0x80340459 KEY_DOWN
-0x8034045a KEY_LEFT
-0x8034045b KEY_RIGHT
-0x8034045c KEY_OK
-0x80340483 KEY_EXIT
-0x8034043e KEY_EPG
-0x8034042f KEY_TITLE
-0x8034046d KEY_RED
-0x8034046e KEY_GREEN
-0x8034046f KEY_YELLOW
-0x80340470 KEY_BLUE
diff --git a/packages/sysutils/v4l-utils/keymaps/zotac.toml b/packages/sysutils/v4l-utils/keymaps/zotac.toml
new file mode 100644
index 0000000000..cbd237d06c
--- /dev/null
+++ b/packages/sysutils/v4l-utils/keymaps/zotac.toml
@@ -0,0 +1,48 @@
+[[protocols]]
+name = "zotac"
+protocol = "rc6"
+variant = "rc6_mce"
+[protocols.scancodes]
+0x8034048e = "KEY_POWER"
+0x8034043d = "KEY_SLEEP"
+0x80340400 = "KEY_NUMERIC_0"
+0x80340401 = "KEY_NUMERIC_1"
+0x80340402 = "KEY_NUMERIC_2"
+0x80340403 = "KEY_NUMERIC_3"
+0x80340404 = "KEY_NUMERIC_4"
+0x80340405 = "KEY_NUMERIC_5"
+0x80340406 = "KEY_NUMERIC_6"
+0x80340407 = "KEY_NUMERIC_7"
+0x80340408 = "KEY_NUMERIC_8"
+0x80340409 = "KEY_NUMERIC_9"
+0x80340432 = "KEY_NUMERIC_POUND"
+0x80340433 = "KEY_NUMERIC_STAR"
+0x8034043a = "KEY_DELETE"
+0x80340434 = "KEY_ENTER"
+0x8034045d = "KEY_MEDIA"
+0x8034040d = "KEY_MUTE"
+0x803404cb = "KEY_INFO"
+0x80340410 = "KEY_VOLUMEUP"
+0x80340411 = "KEY_VOLUMEDOWN"
+0x8034041e = "KEY_CHANNELUP"
+0x8034041f = "KEY_CHANNELDOWN"
+0x80340428 = "KEY_FASTFORWARD"
+0x80340429 = "KEY_REWIND"
+0x8034042c = "KEY_PLAY"
+0x80340437 = "KEY_RECORD"
+0x80340430 = "KEY_PAUSE"
+0x80340431 = "KEY_STOP"
+0x80340420 = "KEY_NEXT"
+0x80340421 = "KEY_PREVIOUS"
+0x80340458 = "KEY_UP"
+0x80340459 = "KEY_DOWN"
+0x8034045a = "KEY_LEFT"
+0x8034045b = "KEY_RIGHT"
+0x8034045c = "KEY_OK"
+0x80340483 = "KEY_EXIT"
+0x8034043e = "KEY_EPG"
+0x8034042f = "KEY_TITLE"
+0x8034046d = "KEY_RED"
+0x8034046e = "KEY_GREEN"
+0x8034046f = "KEY_YELLOW"
+0x80340470 = "KEY_BLUE"