diff --git a/lib/logitech/unifying_receiver/descriptors.py b/lib/logitech/unifying_receiver/descriptors.py
index 56849c3a..326b591f 100644
--- a/lib/logitech/unifying_receiver/descriptors.py
+++ b/lib/logitech/unifying_receiver/descriptors.py
@@ -70,6 +70,30 @@ def _D(name, codename=None, kind=None, registers=None, settings=None):
 
 	DEVICES[codename] = _DeviceDescriptor(name, kind, codename, registers, settings)
 
+#
+#
+#
+
+# Keyboards
+
+_D('Wireless Keyboard K230')
+_D('Wireless Keyboard K270')
+_D('Wireless Keyboard K350')
+_D('Wireless Keyboard K360')
+_D('Wireless Touch Keyboard K400')
+_D('Wireless Keyboard K710',
+				settings=[
+							_register_fn_swap(0x09, true_value=b'\x00\x01', mask=b'\x00\x01'),
+						],
+				)
+_D('Wireless Solar Keyboard K750')
+_D('Wireless Illuminated Keyboard K800',
+				settings=[
+							_register_fn_swap(0x09, true_value=b'\x00\x01', mask=b'\x00\x01'),
+						],
+				)
+
+# Mice
 
 _D('Wireless Mouse M315')
 _D('Wireless Mouse M325')
@@ -77,7 +101,6 @@ _D('Wireless Mouse M505')
 _D('Wireless Mouse M510')
 _D('Couch Mouse M515')
 _D('Wireless Mouse M525')
-_D('Wireless Trackball M570')
 _D('Touch Mouse M600')
 _D('Marathon Mouse M705',
 				settings=[
@@ -85,24 +108,8 @@ _D('Marathon Mouse M705',
 							# _register_dpi(0x63, _NamedInts(**{'100': 10, '300': 30, '350':35, '500':50})),
 						],
 				)
-_D('Wireless Keyboard K230')
-_D('Wireless Keyboard K270')
-_D('Wireless Keyboard K350')
-_D('Wireless Keyboard K360')
-_D('Wireless Touch Keyboard K400')
-_D('Wireless Solar Keyboard K750')
-_D('Wireless Keyboard K710',
-				settings=[
-							_register_fn_swap(0x09, true_value=b'\x00\x01', mask=b'\x00\x01'),
-						],
-				)
-_D('Wireless Illuminated Keyboard K800',
-				settings=[
-							_register_fn_swap(0x09, true_value=b'\x00\x01', mask=b'\x00\x01'),
-						],
-				)
 _D('Zone Touch Mouse T400')
-_D('Wireless Rechargeable Touchpad T650')
+_D('Touch Mouse T620')
 _D('Logitech Cube', kind='mouse')
 _D('Anywhere Mouse MX', codename='Anywhere MX',
 				settings=[
@@ -115,4 +122,12 @@ _D('Performance Mouse MX', codename='Performance MX',
 						],
 				)
 
+# Trackballs
+
+_D('Wireless Trackball M570')
+
+# Touchpads
+
+_D('Wireless Rechargeable Touchpad T650')
+
 del namedtuple