diff --git a/docs/devices/k360.txt b/docs/devices/k360.txt
index abf8ce48..bc0ec049 100644
--- a/docs/devices/k360.txt
+++ b/docs/devices/k360.txt
@@ -53,36 +53,36 @@ Total number of HID++ 2.0 features: 12
      Firmware   : RQK 36.00.B0007
    The power switch is located on the top case
    Supports 13 HID++ 2.0 features:
-       0: ROOT                 {0000}   
-       1: FEATURE SET          {0001}   
-       2: FIRMWARE             {0003}   
-       3: NAME                 {0005}   
-       4: BATTERY              {1000}   
-       5: unknown:1820         {1820}   hidden
-       6: REPROGRAMMABLE KEYS  {1B00}   
-       7: WIRELESS             {1D4B}   
-       8: unknown:1DF0         {1DF0}   hidden
-       9: unknown:1DF3         {1DF3}   hidden
-      10: FN STATUS            {40A0}   
-      11: unknown:4100         {4100}   
-      12: unknown:4520         {4520}   
+       0: ROOT                   {0000}   
+       1: FEATURE SET            {0001}   
+       2: DEVICE FW VERSION      {0003}   
+       3: DEVICE NAME            {0005}   
+       4: BATTERY STATUS         {1000}   
+       5: unknown:1820           {1820}   hidden
+       6: REPROG CONTROLS        {1B00}   
+       7: WIRELESS DEVICE STATUS {1D4B}   
+       8: unknown:1DF0           {1DF0}   hidden
+       9: unknown:1DF3           {1DF3}   hidden
+      10: FN INVERSION           {40A0}   
+      11: ENCRYPTION             {4100}   
+      12: KEYBOARD LAYOUT        {4520}   
    Has 18 reprogrammable keys:
-       0: unknown:  22   34    => Home                   FN sensitive, is FN, reprogrammable    (F1)
-       1: Mail       E   14    => Mail                   FN sensitive, is FN, reprogrammable    (...)
-       2: unknown:  3E   62    => Search                 FN sensitive, is FN, reprogrammable
-       3: unknown:  28   40    => Music                  FN sensitive, is FN, reprogrammable
-       4: Applica    8    8    => Application Switcher   FN sensitive, is FN, reprogrammable    Alt+Tab
-       5: unknown:  6E  110    => unknown:0043           FN sensitive, is FN, reprogrammable    Win+D ("Show desktop")
-       6: unknown:  27   39    => unknown:001C           FN sensitive, is FN, reprogrammable    Win+M ("Minimize")
-       7: unknown:  25   37    => unknown:001B           FN sensitive, is FN, reprogrammable    Win+Shift+M ("Restore windows")
-       8: unknown:  33   51    => unknown:0027           FN sensitive, is FN, reprogrammable    Win+E ("My Computer")
-       9: unknown:  6F  111    => unknown:0044           FN sensitive, is FN, reprogrammable    Win+L ("Lock")
-      10: unknown:  40   64    => Sleep                  FN sensitive, is FN, reprogrammable
-      11: Calcul     A   10    => Calculator             FN sensitive, is FN, reprogrammable    (F12)
-      12: Previou    6    6    => Previous               nonstandard
-      13: Play/P     4    4    => Play/Pause             nonstandard
-      14: Next       5    5    => Next                   nonstandard
-      15: Mute       3    3    => Mute                   nonstandard
-      16: Volume D   2    2    => Volume Down            nonstandard
-      17: Volume Up  1    1    => Volume Up              nonstandard
-   Battery is 90% charged, dischargin
+       0: MY HOME                    => HomePage                      FN sensitive, is FN, reprogrammable
+       1: Mail                       => Mail                          FN sensitive, is FN, reprogrammable
+       2: SEARCH                     => Search                        FN sensitive, is FN, reprogrammable
+       3: MEDIA PLAYER               => Music                         FN sensitive, is FN, reprogrammable
+       4: Application Switcher       => Application Switcher          FN sensitive, is FN, reprogrammable
+       5: SHOW DESKTOP               => ShowDesktop                   FN sensitive, is FN, reprogrammable
+       6: MINIMIZE AS WIN M          => WindowsMinimize               FN sensitive, is FN, reprogrammable
+       7: MAXIMIZE AS WIN SHIFT M    => WindowsRestore                FN sensitive, is FN, reprogrammable
+       8: MY COMPUTER AS WIN E       => My Computer                   FN sensitive, is FN, reprogrammable
+       9: Lock PC                    => WindowsLock                   FN sensitive, is FN, reprogrammable
+      10: SLEEP                      => Sleep                         FN sensitive, is FN, reprogrammable
+      11: Calculator                 => Calculator                    FN sensitive, is FN, reprogrammable
+      12: Previous                   => Previous                      nonstandard
+      13: Play/Pause                 => Play/Pause                    nonstandard
+      14: Next                       => Next                          nonstandard
+      15: Mute                       => Mute                          nonstandard
+      16: Volume Down                => Volume Down                   nonstandard
+      17: Volume Up                  => Volume Up                     nonstandard
+   Battery is 90% charged, discharging
diff --git a/lib/logitech/unifying_receiver/special_keys.py b/lib/logitech/unifying_receiver/special_keys.py
index 0cc6b1e7..7be118b5 100644
--- a/lib/logitech/unifying_receiver/special_keys.py
+++ b/lib/logitech/unifying_receiver/special_keys.py
@@ -6,6 +6,7 @@ from __future__ import absolute_import, division, print_function, unicode_litera
 
 from .common import NamedInts as _NamedInts
 
+# <controls.xml awk -F\" '/<Control /{sub(/^LD_FINFO_(CTRLID_)?/, "", $2);printf("\t%s=0x%04X,\n", $2, $4)}' | sort -t= -k2
 CONTROL = _NamedInts(
 	Volume_Up=0x0001,
 	Volume_Down=0x0002,
@@ -15,12 +16,162 @@ CONTROL = _NamedInts(
 	Previous=0x0006,
 	Stop=0x0007,
 	Application_Switcher=0x0008,
+	BURN=0x0009,
 	Calculator=0x000A,
+	CALENDAR=0x000B,
+	CLOSE=0x000C,
+	EJECT=0x000D,
 	Mail=0x000E,
-	Home=0x001A,
-	Music=0x001D,
-	Search=0x0029,
-	Sleep=0x002F,
+	HELP_AS_HID=0x000F,
+	HELP_AS_F1=0x0010,
+	LAUNCH_WORD_PROC=0x0011,
+	LAUNCH_SPREADSHEET=0x0012,
+	LAUNCH_PRESENTATION=0x0013,
+	UNDO_AS_CTRL_Z=0x0014,
+	UNDO_AS_HID=0x0015,
+	REDO_AS_CTRL_Y=0x0016,
+	REDO_AS_HID=0x0017,
+	PRINT_AS_CTRL_P=0x0018,
+	PRINT_AS_HID=0x0019,
+	SAVE_AS_CTRL_S=0x001A,
+	SAVE_AS_HID=0x001B,
+	PRESET_A=0x001C,
+	PRESET_B=0x001D,
+	PRESET_C=0x001E,
+	PRESET_D=0x001F,
+	FAVORITES=0x0020,
+	GADGETS=0x0021,
+	MY_HOME=0x0022,
+	GADGETS_AS_WIN_G=0x0023,
+	MAXIMIZE_AS_HID=0x0024,
+	MAXIMIZE_AS_WIN_SHIFT_M=0x0025,
+	MINIMIZE_AS_HID=0x0026,
+	MINIMIZE_AS_WIN_M=0x0027,
+	MEDIA_PLAYER=0x0028,
+	MEDIA_CENTER_LOGI=0x0029,
+	MEDIA_CENTER_MSFT=0x002A, # Should not be used as it is not reprogrammable under Windows
+	CUSTOM_MENU=0x002B,
+	MESSENGER=0x002C,
+	MY_DOCUMENTS=0x002D,
+	MY_MUSIC=0x002E,
+	WEBCAM=0x002F,
+	MY_PICTURES=0x0030,
+	MY_VIDEOS=0x0031,
+	MY_COMPUTER_AS_HID=0x0032,
+	MY_COMPUTER_AS_WIN_E=0x0033,
+	LAUNC_PICTURE_VIEWER=0x0035,
+	ONE_TOUCH_SEARCH=0x0036,
+	PRESET_1=0x0037,
+	PRESET_2=0x0038,
+	PRESET_3=0x0039,
+	PRESET_4=0x003A,
+	RECORD=0x003B,
+	INTERNET_REFRESH=0x003C,
+	ROTATE_RIGHT=0x003D,
+	SEARCH=0x003E,
+	SHUFFLE=0x003F,
+	SLEEP=0x0040,
+	INTERNET_STOP=0x0041,
+	SYNCHRONIZE=0x0042,
+	ZOOM=0x0043,
+	ZOOM_IN_AS_HID=0x0044,
+	ZOOM_IN_AS_CTRL_WHEEL=0x0045,
+	ZOOM_IN_AS_CLTR_PLUS=0x0046,
+	ZOOM_OUT_AS_HID=0x0047,
+	ZOOM_OUT_AS_CTRL_WHEEL=0x0048,
+	ZOOM_OUT_AS_CLTR_MINUS=0x0049,
+	ZOOM_RESET=0x004A,
+	ZOOM_FULL_SCREEN=0x004B,
+	PRINT_SCREEN=0x004C,
+	PAUSE_BREAK=0x004D,
+	SCROLL_LOCK=0x004E,
+	CONTEXTUAL_MENU=0x004F,
+	LEFT_CLICK=0x0050,
+	RIGHT_CLICK=0x0051,
+	MIDDLE_BUTTON=0x0052,
+	BACK_AS_BUTTON_4=0x0053,
+	BACK_AS_HID=0x0054,
+	BACK_AS_ALT_WIN_ARROW=0x0055,
+	FORWARD_AS_BUTTON_5=0x0056,
+	FORWARD_AS_HID=0x0057,
+	FORWARD_AS_ALT_WIN_ARROW=0x0058,
+	BUTTON_6=0x0059,
+	LEFT_SCROLL_AS_BUTTON_7=0x005A,
+	LEFT_SCROLL_AS_AC_PAN=0x005B,
+	RIGHT_SCROLL_AS_BUTTON_8=0x005C,
+	RIGHT_SCROLL_AS_AC_PAN=0x005D,
+	BUTTON_9=0x005E,
+	BUTTON_10=0x005F,
+	BUTTON_11=0x0060,
+	BUTTON_12=0x0061,
+	BUTTON_13=0x0062,
+	BUTTON_14=0x0063,
+	BUTTON_15=0x0064,
+	BUTTON_16=0x0065,
+	BUTTON_17=0x0066,
+	BUTTON_18=0x0067,
+	BUTTON_19=0x0068,
+	BUTTON_20=0x0069,
+	BUTTON_21=0x006A,
+	BUTTON_22=0x006B,
+	BUTTON_23=0x006C,
+	BUTTON_24=0x006D,
+	SHOW_DESKTOP=0x006E,
+	Lock_PC=0x006F,
+	FN_F1=0x0070,
+	FN_F2=0x0071,
+	FN_F3=0x0072,
+	FN_F4=0x0073,
+	FN_F5=0x0074,
+	FN_F6=0x0075,
+	FN_F7=0x0076,
+	FN_F8=0x0077,
+	FN_F9=0x0078,
+	FN_F10=0x0079,
+	FN_F11=0x007A,
+	FN_F12=0x007B,
+	FN_F13=0x007C,
+	FN_F14=0x007D,
+	FN_F15=0x007E,
+	FN_F16=0x007F,
+	FN_F17=0x0080,
+	FN_F18=0x0081,
+	FN_F19=0x0082,
+	IOS_HOME=0x0083,
+	ANDROID_HOME=0x0084,
+	ANDROID_MENU=0x0085,
+	ANDROID_SEARCH=0x0086,
+	ANDROID_BACK=0x0087,
+	HOME_COMBO=0x0088,
+	LOCK_COMBO=0x0089,
+	IOS_VIRTUAL_KEYBOARD=0x008A,
+	IOS_LANGUAGE_SWICH=0x008B,
+	MAC_EXPOSE=0x008C,
+	MAC_DASHBOARD=0x008D,
+	WIN7_SNAP_LEFT=0x008E,
+	WIN7_SNAP_RIGHT=0x008F,
+	WIN7_MINIMIZE_AS_WIN_ARROW=0x0090,
+	WIN7_MAXIMIZE_AS_WIN_ARROW=0x0091,
+	WIN7_STRETCH_UP=0x0092,
+	WIN7_MONITOR_SWITCH_AS_WIN_SHIFT_LEFTARROW=0x0093,
+	WIN7_MONITOR_SWITCH_AS_WIN_SHIFT_RIGHTARROW=0x0094,
+	WIN7_SHOW_PRESENTATION_MODE=0x0095,
+	WIN7_SHOW_MOBILITY_CENTER=0x0096,
+	ANALOG_HSCROLL=0x0097,
+	METRO_APPSWITCH=0x009F,
+	METRO_APPBAR=0x00A0,
+	METRO_CHARMS=0x00A1,
+	CALC_VKEYBOARD=0x00A2,
+	METRO_SEARCH=0x00A3,
+	COMBO_SLEEP=0x00A4,
+	METRO_SHARE=0x00A5,
+	METRO_SETTINGS=0x00A6,
+	METRO_DEVICES=0x00A7,
+	METRO_START_SCREEN=0x00A9,
+	ZOOMIN=0x00AA,
+	ZOOMOUT=0x00AB,
+	BACK_HSCROLL=0x00AC,
+	SHOW_DESKTOP_HPP=0x00AE,
 )
 CONTROL._fallback = lambda x: 'unknown:%04X' % x
 
diff --git a/lib/solaar/cli.py b/lib/solaar/cli.py
index 894c7644..4691ad9f 100644
--- a/lib/solaar/cli.py
+++ b/lib/solaar/cli.py
@@ -155,7 +155,7 @@ def _print_device(dev, verbose=False):
 			print ("   Has %d reprogrammable keys:" % len(dev.keys))
 			for k in dev.keys:
 				flags = special_keys.KEY_FLAG.flag_names(k.flags)
-				print ("      %2d: %-20s => %-20s   %s" % (k.index, k.key, k.task, ', '.join(flags)))
+				print ("      %2d: %-26s => %-27s   %s" % (k.index, k.key, k.task, ', '.join(flags)))
 
 	if p > 0:
 		battery = hidpp20.get_battery(dev)