Thanks for the update! It's also in QMC2 SVN r5341 now.
But I see more sets than just 6 that aren't categorized... especially many new devices (using MESS SVN r26174).
Here's my proposal for a few of the missing non-device sets:
[Laptop / Portable]
[Business Computer / Terminal]