diff --git a/qubesadmin/device_protocol.py b/qubesadmin/device_protocol.py
index 049da454..c2a609b2 100644
--- a/qubesadmin/device_protocol.py
+++ b/qubesadmin/device_protocol.py
@@ -646,13 +646,14 @@ class DeviceCategory(Enum):
     Microphone = ("m******",)
     # Multimedia = Audio, Video, Displays etc.
     Multimedia = (
-        "u01****",
-        "u0e****",
         "u06****",
         "u10****",
         "p03****",
         "p04****",
     )
+    Audio = ("p0403**", "u01****")
+    Display = ("p0300**", "p0380**")
+    Video = ("p0400**", "u0e****")
     Wireless = ("ue0****", "p0d****")
     Bluetooth = ("ue00101", "p0d11**")
     Storage = ("b******", "u08****", "p01****")
diff --git a/qubesadmin/tests/tools/qvm_device.py b/qubesadmin/tests/tools/qvm_device.py
index ade142b3..5be42dee 100644
--- a/qubesadmin/tests/tools/qvm_device.py
+++ b/qubesadmin/tests/tools/qvm_device.py
@@ -77,7 +77,7 @@ def test_000_list_all(self):
                 ['testclass', 'list'], app=self.app)
             self.assertEqual(
                 [x.rstrip() for x in buf.getvalue().splitlines()],
-                ['test-vm1:dev1  Multimedia: itl test-device',
+                ['test-vm1:dev1  Audio: itl test-device',
                  'test-vm2:dev2  ?******: ? ` test-device']
             )
 
@@ -151,7 +151,7 @@ def test_002_list_attach(self):
                 ['testclass', 'list', 'test-vm3'], app=self.app)
             self.assertEqual(
                 buf.getvalue(),
-                'test-vm1:dev1  Multimedia: itl test-device  '
+                'test-vm1:dev1  Audio: itl test-device  '
                 'test-vm3 (attached)\n'
             )
 
@@ -564,6 +564,6 @@ def test_060_device_info(self):
             qubesadmin.tools.qvm_device.main(
                 ['testclass', 'info', 'test-vm1:dev1'],
                 app=self.app)
-            self.assertIn('Multimedia: itl test-device\ndevice ID: dead:beef:babe:u012345',
+            self.assertIn('Audio: itl test-device\ndevice ID: dead:beef:babe:u012345',
                           buf.getvalue())
         self.assertAllCalled()