svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 236 insertions, 659 deletions

diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index 54ec2418c..a159021f8 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -23,6 +23,7 @@
 // Very common set of media keys
 partial hidden alphanumeric_keys
 xkb_symbols "media_common" {
+    key <I01>   {       [ XF86AudioMedia        ] }; 
     key <I10>   {       [ XF86AudioPrev         ] };
     key <I19>   {       [ XF86AudioNext         ] };
     key <I20>   {       [ XF86AudioMute         ] };
@@ -30,21 +31,62 @@ xkb_symbols "media_common" {
     key <I24>   {       [ XF86AudioStop, XF86Eject ] };
     key <I2E>   {       [ XF86AudioLowerVolume  ] };	
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
+    key <K5A>   {       [ XF86Eject             ] };
 };
 
 // popular web navigation combination
 partial hidden alphanumeric_keys
 xkb_symbols "nav_common" {
-    key <I69>   {       [ XF86Forward           ]       };
-    key <I6A>   {       [ XF86Back              ]       };
+    key <I21>   {       [ XF86Calculator        ] }; 
+    key <I32>   {       [ XF86WWW               ] };
+    key <I65>   {       [ XF86Search            ] };
+    key <I66>   {       [ XF86Favorites         ] };
+    key <I67>   {       [ XF86Reload            ] };
+    key <I68>   {       [ XF86Stop              ] };
+    key <I69>   {       [ XF86Forward           ] };
+    key <I6A>   {       [ XF86Back              ] };
+    key <I6B>   {       [ XF86MyComputer        ] };
+    key <I6C>   {       [ XF86Mail              ] };
+    key <I6D>   {       [ XF86AudioMedia        ] }; 
 };
 
+// ACPI Standard
+partial hidden alphanumeric_keys
+xkb_symbols "acpi_common" {
+    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I5F>	{	[ XF86Standby		]	};
+    key <I63>	{	[ XF86WakeUp		]	};
+    key <I74>	{	[ XF86Battery		]	};
+    key <I76>	{	[ XF86WLAN		]	};
+    key <I16>	{	[ XF86Sleep		]	};
+};
+
+// Combined sections, for simplicity
 partial hidden alphanumeric_keys
 xkb_symbols "media_nav_common" {
     include "inet(media_common)"
     include "inet(nav_common)"
 };
 
+partial hidden alphanumeric_keys
+xkb_symbols "media_nav_acpi_common" {
+    include "inet(media_common)"
+    include "inet(nav_common)"
+    include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "nav_acpi_common" {
+    include "inet(nav_common)"
+    include "inet(acpi_common)"
+};
+
+partial hidden alphanumeric_keys
+xkb_symbols "media_acpi_common" {
+    include "inet(media_common)"
+    include "inet(acpi_common)"
+};
+
 // Evdev Standardized Keycodes
 partial alphanumeric_keys
 xkb_symbols "evdev" {
@@ -65,7 +107,9 @@ xkb_symbols "evdev" {
     key <HELP>   {      [ Help                  ]       };
     key <LNFD>   {      [ Linefeed              ]       };
 
-    key <HZTG>   {      [ Zenkaku_Hankaku       ]       };
+// Commented out because HZTG has same keycode as TLDE
+//    key <HZTG>   {      [ Zenkaku_Hankaku       ]       };
+
     key <HKTG>   {      [ Hiragana_Katakana     ]       };
     key <HENK>   {      [ Henkan                ]       };
     key <MUHE>   {      [ Muhenkan              ]       };
@@ -113,7 +157,7 @@ xkb_symbols "evdev" {
 //  key <I178>   {      [ ]       }; // KEY_ISO
     key <I179>   {      [ XF86Tools             ]       };
     key <I180>   {      [ XF86HomePage          ]       };
-    key <I181>   {      [ XF86Refresh           ]       };
+    key <I181>   {      [ XF86Reload           ]       };
     key <I182>   {      [ XF86Close             ]       };
 //  key <I183>   {      [ ]       }; // KEY_MOVE
 //  key <I184>   {      [ ]       }; // KEY_EDIT
@@ -127,7 +171,7 @@ xkb_symbols "evdev" {
     key <I209>   {      [ XF86AudioPause        ]       };
     key <I210>   {      [ XF86Launch3           ]       };
     key <I211>   {      [ XF86Launch4           ]       };
-    key <I213>   {      [ XF86Standby           ]       };
+    key <I213>   {      [ XF86Suspend           ]       };
     key <I214>   {      [ XF86Close             ]       };
     key <I215>   {      [ XF86AudioPlay         ]       };
     key <I216>   {      [ XF86Forward           ]       };
@@ -158,64 +202,24 @@ xkb_symbols "evdev" {
     key <I241>   {      [ XF86MailForward       ]       };
     key <I242>   {      [ XF86Save              ]       };
     key <I243>   {      [ XF86Documents         ]       };
-//  key <I244>   {      [ ]       }; // KEY_BATTERY
-//  key <I245>   {      [ ]       }; // KEY_BLUETOOTH
-//  key <I246>   {      [ ]       }; // KEY_WLAN
+    key <I244>   {      [ XF86Battery           ]       };
+    key <I245>   {      [ XF86Bluetooth         ]       };
+    key <I246>   {      [ XF86WLAN              ]       };
 //  key <I249>   {      [ ]       }; // KEY_VIDEO_NEXT  --  drive next video source
 //  key <I250>   {      [ ]       }; // KEY_VIDEO_PREV  --  drive previous video source
 //  key <I251>   {      [ ]       }; // KEY_BRIGHTNESS_CYCLE  --  bright up, max++ == min
 //  key <I252>   {      [ ]       }; // KEY_BRIGHTNESS_ZERO  --  brightness off
 //  key <I253>   {      [ ]       }; // KEY_DISPLAY_OFF  --  turn off display
+//  key <I254>   {      [ ]       }; // KEY_WIMAX
+    key <I255>   {      [ XF86Hibernate         ]       }; // KEY_HIBERNATE
  
 };
 
 
-// A4Tech KB-21
-partial alphanumeric_keys
-xkb_symbols "a4techKB21" {
-    include "inet(media_nav_common)"
-    key <I32>   {       [ XF86HomePage          ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-};
-
-// A4 KBS-8. Contributed by ojo at force dot sk
-partial alphanumeric_keys 
-xkb_symbols "a4techKBS8" { 
-    include "inet(a4techKB21)"
-    key <I21>   {       [ XF86Calculator        ]       }; 
-    key <I5F>   {       [ XF86Standby           ]       }; 
-    key <I6D>   {       [ XF86AudioMedia        ]       }; 
-};
-
-// A4Tech Wireless Desktop (RFKB-23)
-partial alphanumeric_keys
-xkb_symbols "a4_rfkb23" {
-    include "inet(media_common)"
-    key <I21>   {       [ XF86Calculator                ]       };
-    key <I32>   {       [ XF86HomePage                  ]       };
-    key <I32>   {       [ XF86WWW                       ]       };
-    key <I5F>   {       [ XF86Sleep                     ]       };
-    key <I65>   {       [ XF86Search                    ]       };
-    key <I66>   {       [ XF86Favorites                 ]       };
-    key <I67>   {       [ XF86Refresh                   ]       };
-    key <I68>   {       [ XF86Stop                      ]       };
-// should they be swapped?
-    key <I69>   {       [ XF86Back                      ]       };
-    key <I6A>   {       [ XF86Forward                   ]       };
-
-    key <I6B>   {       [ XF86MyComputer                ]       };
-    key <I6C>   {       [ XF86Mail                      ]       };
-    key <I6D>   {       [ XF86AudioMedia                ]       };
-};
-
 // Acer AirKey V
 partial alphanumeric_keys
 xkb_symbols "airkey" {
+    include "inet(acpi_common)"
     key <I13>	{	[ XF86AudioNext		]	};
     key <I15>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I16>	{	[ XF86Mail		]	};
@@ -226,22 +230,18 @@ xkb_symbols "airkey" {
     key <I2D>	{	[ XF86AudioRaiseVolume	]	};
     key <I2F>	{	[ XF86Terminal		]	};
     key <I31>	{	[ XF86AudioStop, XF86Eject ]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I63>	{	[ XF86Standby		]	};
 };
 
 // Acer C300 Laptop
 partial alphanumeric_keys
 xkb_symbols "acer_c300" {
-
+    include "inet(nav_common)"
     key <I17>   {       [ F14                   ]       };
     key <I1F>   {       [ F13                   ]       };
     key <I20>   {       [ XF86AudioMute         ]       };
     key <I2E>   {       [ XF86AudioLowerVolume  ]       };
     key <I30>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I32>   {       [ XF86Mail              ]       };
     key <I5E>   {       [ XF86Launch2           ]       };
-    key <I6C>   {       [ XF86WWW               ]       };
     key <I75>   {       [ Help                  ]       };
     key <XFER>  {       [ XF86Launch1           ]       };
 };
@@ -250,12 +250,10 @@ xkb_symbols "acer_c300" {
 // From Alex Dubov <oakad@yahoo.com>
 partial alphanumeric_keys
 xkb_symbols "acer_ferrari4k" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I24>   {       [ dollar                ]       };
     key <I25>   {       [ EuroSign              ]       };
     key <I26>   {       [ XF86Display           ]       };
-    key <I32>   {       [ XF86WWW               ]       }; //"Saturn" button
-    key <I6C>   {       [ XF86Mail              ]       }; //"mail" button
     // Missing keycodes - set-up with setkeycodes
     key <I70>   {       [ Help                  ]       };
     key <I71>   {       [ XF86Launch1           ]       };
@@ -271,17 +269,14 @@ xkb_symbols "acer_ferrari4k" {
 // (Not all these keys will be available on every Acer laptop)
 partial alphanumeric_keys
 xkb_symbols "acer_laptop" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I17>   {       [ XF86Launch2           ]        }; // "P" or "P2" (HAL)
     key <I1F>   {       [ XF86Launch1           ]        }; // "e" or "P1" (HAL)
 
     // Hotkeys (Function)
     // Launch Keys
     // Device keys
-    key <I32>   {       [ XF86WWW               ]        }; // "Saturn" button
     key <I56>   {       [ XF86Display           ]        }; // Fn+F5 (HAL)
-    key <I5F>   {       [ XF86Sleep             ]        }; // Fn+F4
-    key <I6C>   {       [ XF86Mail              ]        }; // "mail" button
     key <I71>   {       [ XF86Launch4           ]        }; // Fn+F3 (HAL)
     key <I72>   {       [ XF86LaunchB           ]        }; // Bluetooth (HAL)
     key <I73>   {       [ XF86LaunchA           ]        }; // Wireless (HAL)
@@ -299,74 +294,33 @@ xkb_symbols "acer_laptop" {
 //  key <K5E>   {       [ dollar                ]        }; // Dollar (HAL)
 };
 
-// Asus
-partial alphanumeric_keys
-xkb_symbols "asus_laptop" {
-    include "inet(media_common)"
-    key <I32>   {       [ XF86WWW               ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-};
-
 // Azona
 
 // Azona RF2300 wireless Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "azonaRF2300" {
     // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(nav_common)"
-    key <I02>   {       [ XF86WWW               ]       };
+    include "inet(nav_acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I17>   {       [ XF86AudioStop         ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
     key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>   {       [ XF86Calculator        ]       };
     key <I22>   {       [ XF86AudioNext         ]       };
     key <I24>   {       [ XF86AudioPrev         ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
     key <I3C>   {       [ XF86Copy              ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
     key <I78>   {       [ XF86Cut               ]       };
 //  key <RCTL>  {       [ XF86Paste             ]       };
 };
 
-// ACPI Standard
-partial alphanumeric_keys
-xkb_symbols "acpi" {
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-
-// Advance
-
-// Advance Scorpius KI
-partial alphanumeric_keys
-xkb_symbols "scorpius" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-    key <I6D>	{	[ XF86AudioMedia	]	};
-};
-
 
 // Brother
 
 // Brother Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "brother" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86ScrollUp		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I17>	{	[ XF86AudioPrev		]	};
@@ -382,9 +336,6 @@ xkb_symbols "brother" {
     key <I2E>	{	[ XF86AudioNext		]	};
     key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86ZoomIn		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86AudioLowerVolume	]	};
 };
 
@@ -394,6 +345,7 @@ xkb_symbols "brother" {
 // BTC 5113RF Multimedia
 partial alphanumeric_keys
 xkb_symbols "btc5113rf" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -406,30 +358,13 @@ xkb_symbols "btc5113rf" {
     key <I26>	{	[ XF86Back		]	};
     key <I30>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-// BTC 5126T
-partial alphanumeric_keys
-xkb_symbols "btc5126t" {
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
-// BTC 6301URF
-partial alphanumeric_keys
-xkb_symbols "btc6301urf" {
-    include "inet(media_nav_common)"
-    include "inet(btc5126t)"
-    key <I66>	{	[ XF86Favorites		]	};
-};
 
 // BTC 9000
 partial alphanumeric_keys
 xkb_symbols "btc9000" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -443,14 +378,12 @@ xkb_symbols "btc9000" {
     key <I2E>	{	[ XF86Mail		]	};
     key <I30>	{	[ XF86HomePage		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>   {	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
 };
 
 // BTC 9000A
 partial alphanumeric_keys
 xkb_symbols "btc9000a" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioStop		]	};
     key <I12>	{	[ XF86AudioMute		]	};
     key <I19>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -464,14 +397,12 @@ xkb_symbols "btc9000a" {
     key <I2E>	{	[ Help			]	};
     key <I30>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Search		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
 };
 
 // BTC 9001AH
 xkb_symbols "btc9001ah" {
-    key <I02>   {       [ XF86WWW               ]       };
+    include "inet(acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I17>   {       [ XF86AudioStop         ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
     key <I1F>   {       [ XF86AudioPlay, XF86AudioPause ] };
@@ -479,7 +410,6 @@ xkb_symbols "btc9001ah" {
     key <I24>   {       [ XF86AudioPrev         ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
-    key <I5F>   {       [ XF86PowerOff          ]       };
     key <I6C>   {       [ XF86Mail              ]       };
     key <RWIN>  {       [ XF86Eject             ]       };
 };
@@ -487,26 +417,17 @@ xkb_symbols "btc9001ah" {
 // BTC 5090
 partial alphanumeric_keys
 xkb_symbols "btc5090" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I26>   {       [ XF86Start             ]       };
-    key <I32>   {       [ XF86WWW               ]       };
     key <I33>   {       [ XF86Eject             ]       };
-    key <I5E>   {       [ XF86PowerOff          ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I63>   {       [ XF86WakeUp            ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
 };
 
 // BTC 9019U
 partial alphanumeric_keys
 xkb_symbols "btc9019u" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <FK17> {	[ XF86Search		]	};
     key <I02>  {	[ XF86HomePage		]	};
-    key <I5F>  {	[ XF86Sleep		]	};
-    key <I66>  {	[ XF86Favorites		]	};
-    key <I6C>  {	[ XF86Mail		]	};
     key <K6C>  {	[ XF86Eject		]	};
 };
 
@@ -521,16 +442,11 @@ xkb_symbols "cherryblue" {
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>	{	[ XF86Calculator	]	};
     key <I22>	{	[ XF86AudioNext		]	};
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I63>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86MyComputer	]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PRSC>	{	[ XF86Terminal		]	};
     key <XFER>	{	[ XF86Go		]	};
 };
@@ -549,18 +465,12 @@ xkb_symbols "cherryblueb" {
     key <I17>   {       [ XF86Cut               ]       };
     key <I18>   {       [ XF86Paste             ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I21>   {       [ XF86Calculator        ]       };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
     key <I2C>   {       [ XF86Book              ]       };
     key <I32>   {       [ XF86Finance           ]       };
     key <I63>   {       [ XF86Standby                   ] };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86MyComputer        ]       };
     key <I67>   {       [ XF86AudioRewind       ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
     key <I70>   {       [ XF86Eject             ]       };
     key <I71>   {       [ XF86Book              ]       };
     key <I72>   {       [ XF86Book              ]       };
@@ -571,41 +481,35 @@ xkb_symbols "cherryblueb" {
 // Cherry Blue Line CyBo@rd (alternate option)
 partial alphanumeric_keys
 xkb_symbols "cherrybluea" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86MyComputer	]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86Terminal		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <I6D>	{	[ XF86Go		]	};
 };
 
 // Cherry CyBo@rd USB-Hub
 partial alphanumeric_keys
 xkb_symbols "cherrycyboard" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <FK17>    {   [ XF86Search        ]   };
     key <I02> {   [ XF86HomePage      ]   };
-    key <I21> {   [ XF86Calculator    ]   };
-    key <I5F> {   [ XF86Standby       ]   };
-    key <I66> {   [ XF86MyComputer    ]   };
-    key <I67> {   [ XF86Reload        ]   };
-    key <I68> {   [ XF86Stop          ]   };
-    key <I6C> {   [ XF86Mail          ]   };
     key <K67> {   [ XF86Terminal      ]   };
     key <XFER>    {   [ XF86AudioMedia    ]   };
 };
 
+// Cherry CyMotion Expert
+partial alphanumeric_keys 
+xkb_symbols "cherrycmexpert" {
+    include "inet(cherryblueb)"
+    include "inet(acpi_common)"
+    key <FK15>	{	[ XF86Mail		]	};
+};
+
 
 // Chicony
 
 // Chicony Internet Keyboard
 partial alphanumeric_keys 
 xkb_symbols "chicony" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioMute		]	};
     key <I17>	{	[ XF86Mail		]	};
     key <I19>	{	[ XF86AudioLowerVolume	]	};
@@ -619,8 +523,7 @@ xkb_symbols "chicony" {
     key <I26>	{	[ XF86LaunchB		]	};
     key <I2E>	{	[ XF86LaunchC		]	};
     key <I30>	{	[ XF86LaunchA		]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
+    key <I32>	{	[ XF86WWW		]	};
     key <I5F>	{	[ XF86ContrastAdjust	]	};
     key <I63>	{	[ XF86BrightnessAdjust	]	};
 };
@@ -629,12 +532,20 @@ xkb_symbols "chicony" {
 partial alphanumeric_keys 
 xkb_symbols "chicony0108" {
     include "inet(cherrycyboard)"
-    key <I66>	{	[ XF86New		]	};
+};
+
+// Chicony KU-0420 AKA Targus Slim Internet Media USB Keyboard
+partial alphanumeric_keys
+xkb_symbols "chicony0420" {
+    include "inet(media_nav_acpi_common)"
+    key <I01>   {       [ XF86AudioMedia        ]       };
+    key <K67>   {       [ XF86MyComputer        ]       };
 };
 
 // Chicony KB-9885
 partial alphanumeric_keys
 xkb_symbols "chicony9885" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioMute		]	};
     key <I17>	{	[ XF86Mail		]	};
     key <I19>	{	[ XF86AudioLowerVolume	]	};
@@ -649,9 +560,6 @@ xkb_symbols "chicony9885" {
     key <I2E>	{	[ XF86LaunchC		]	};
     key <I30>	{	[ XF86LaunchA		]	};
     key <I32>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
 };
 
 
@@ -685,19 +593,18 @@ xkb_symbols "compaqik7" {
 // Compaq Internet Keyboard (13 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik13" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Go		]	};
     key <I21>	{	[ XF86Search		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // Compaq Internet Keyboard (18 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik18" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I12>	{	[ XF86LightBulb		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86Mail		]	};
@@ -707,7 +614,6 @@ xkb_symbols "compaqik18" {
     key <I25>	{	[ XF86VendorHome	]	};
     key <I26>	{	[ XF86Community		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I68>	{	[ Print			]	};
 };
 
@@ -715,13 +621,12 @@ xkb_symbols "compaqik18" {
 // Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
 partial alphanumeric_keys
 xkb_symbols "armada" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I1A>	{	[ XF86Search		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86HomePage		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I59>   {       [ XF86Launch2           ]       }; // Battery Monitor 
-    key <I5F>   {       [ XF86Standby           ]       }; 
     key <I6F>	{	[ XF86AudioMedia	]	};
     key <I75>   {       [ XF86Launch0           ]       }; // Info Center 
 };
@@ -729,14 +634,13 @@ xkb_symbols "armada" {
 // Laptop/notebook Compaq (eg. Presario) Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "presario" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I14>	{	[ XF86Q			]	};
     key <I18>	{	[ XF86Launch2		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Launch1		]	};
     key <I23>	{	[ XF86WWW		]	};
     key <I32>	{	[ XF86Shop		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I75>	{	[ XF86AudioMedia	]	};
 };
 
@@ -757,10 +661,10 @@ xkb_symbols "ipaq" {
 
 partial alphanumeric_keys
 xkb_symbols "dell" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86Mail		]	};
     key <I1E>	{	[ XF86Search		]	};
     key <I26>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // Dell Precision M65
@@ -771,22 +675,6 @@ xkb_symbols "dellm65" {
     key <LWIN>  {       [ Super_L               ]       };
 };
 
-// Genius KB-19e NB
-partial alphanumeric_keys
-xkb_symbols "geniuskb19e" {
-    include "inet(media_nav_common)"
-    key <I21>   {      [ XF86Calculator        ]       };
-    key <I32>   {      [ XF86HomePage          ]       };
-    key <I5F>   {      [ XF86Sleep             ]       };
-    key <I65>   {      [ XF86Search            ]       };
-    key <I66>   {      [ XF86Favorites         ]       };
-    key <I67>   {      [ XF86Refresh           ]       };
-    key <I68>   {      [ XF86Stop              ]       };
-    key <I6B>   {      [ XF86MyComputer        ]       };
-    key <I6C>   {      [ XF86Mail              ]       };
-    key <I6D>   {      [ XF86AudioMedia        ]       };
-};
-
 // Laptop/notebook Dell Inspiron 8xxx
 partial alphanumeric_keys
 xkb_symbols "inspiron" {
@@ -799,158 +687,55 @@ xkb_symbols "inspiron" {
     key <XFER>  {       [ XF86AudioPlay, XF86AudioPause ] };
 };
 
-partial alphanumeric_keys
-xkb_symbols "latitude" {
-    include "inet(media_common)"
-};
-
-// Laptop/notebook Dell Precision-M series
-partial alphanumeric_keys
-xkb_symbols "precision_m" {
-    // Describes the extra keys on a Precision M series
-    // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
-    include "inet(media_common)"
-    key <I32>	{	[ XF86HomePage		]	};
-};
-
 // DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
 partial alphanumeric_keys
 xkb_symbols "dellusbmm" {
     // Describes the extra keys on a SK-8135 Multimedia keyboard
     // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <K67>	{	[ XF86MyComputer	]	}; 
     key <XFER>	{	[ XF86AudioMedia	]	};  
 };
 
 
-// Dexxa
-
-// Dexxa Wireless Desktop Keyboard
-partial alphanumeric_keys
-xkb_symbols "dexxa" {
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-
 // Diamond
 
 // Diamond 9801 / 9802 series
 partial alphanumeric_keys
 xkb_symbols "diamond" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <I6D>	{	[ XF86Go		]	};
 };
 
-// DTK
-
-// DTK2000
-partial alphanumeric_keys
-xkb_symbols "dtk2000" {
-    // Describes the extra keys on a DTK2000 Internet keyboard.
-    // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(media_nav_common)"
-    key <I21>   {       [ XF86Calculator        ]       };
-    key <I32>   {       [ XF86HomePage          ]       };
-    key <I5E>   {       [ XF86PowerOff          ]       };
-    key <I5F>   {       [ XF86Sleep             ]       };
-    key <I63>   {       [ XF86WakeUp            ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
-};
-
 
 // Ennyah
 
 // Ennyah DKB-1008
 partial alphanumeric_keys
 xkb_symbols "ennyah_dkb1008" {
-    include "inet(media_nav_common)"
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5E>   {	[ XF86PowerOff		]	};
-    key <I5F>   {	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Refresh		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_acpi_common)"
     key <XFER>  {	[ XF86AudioMedia	]	};
 };
 
 
-// Fujitsu-Siemens Computers
-
-// Fujitsu-Siemens Computers AMILO A1667G laptop
-partial alphanumeric_keys
-xkb_symbols "fscaa1667g" {
-   include "inet(media_common)"
-   key <I32>   {       [ XF86WWW               ]       };
-   key <I6C>   {       [ XF86Mail              ]       };
-};
-
-
 // Genius
 
 // Genius Comfy KB-16M / Genius MM Keyboard KWD-910
 partial alphanumeric_keys
 xkb_symbols "genius" {
+    include "inet(media_acpi_common)"
     key <I12>   {	[ XF86AudioRaiseVolume	]	};
     key <I17>   {	[ XF86Calculator	]	};
     key <I19>   {	[ XF86AudioLowerVolume	]	};
     key <I1E>   {	[ XF86Forward		]	};
-    key <I20>   {	[ XF86AudioMute		]	};
     key <I21>   {	[ XF86AudioNext		]	};
-    key <I22>   {	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86AudioPrev		]	};
-    key <I24>   {	[ XF86AudioStop		]	};
     key <I25>   {	[ XF86Back		]	};
     key <I26>   {	[ XF86ScreenSaver	]	};
     key <I2E>   {	[ XF86Mail		]	};
     key <I30>   {	[ XF86Eject		]	};
     key <I32>   {	[ XF86WWW		]	};
-    key <I5F>   {	[ XF86Standby		]	};
-    key <I63>   {	[ XF86WakeUp		]	};
-};
-
-
-partial alphanumeric_keys
-xkb_symbols "geniuscomfy" {
-    // Describes the extra keys on a Genius Comfy KB-12e
-    // From Jurica Vukadin <jura@webit.hr>
-    include "inet(media_nav_common)"
-    key <I21>   {       [ XF86Calculator        ]       };
-    key <I32>   {       [ XF86WWW	        ]       };
-    key <I5F>   {       [ XF86Sleep             ]       };
-    key <I6B>   {       [ XF86MyComputer        ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I6D>   {       [ XF86AudioMedia        ]       };
 };
 
 
@@ -959,12 +744,8 @@ partial alphanumeric_keys
 xkb_symbols "geniuscomfy2" {
     // Describes the extra keys on a Genius Comfy KB-21e-Scroll
     // From Radics Laszlo <garaboncias@mailbox.hu>
-    include "inet(geniuscomfy)"
+    include "inet(media_nav_acpi_common)"
     key <I23>   {       [ Return                ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I66>   {       [ XF86Favorites         ]       };
-    key <I67>   {       [ XF86Refresh           ]       };
-    key <I68>   {       [ XF86Stop              ]       };
 };
 
 // Gyration
@@ -973,7 +754,7 @@ partial alphanumeric_keys
 xkb_symbols "gyration" {
     include "inet(nav_common)"
     key <FK16>	{	[ XF86Reload		]	};
-    key <I02>	{	[ XF86WWW		]	};
+    key <I02>	{	[ XF86HomePage		]	};
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
@@ -981,10 +762,6 @@ xkb_symbols "gyration" {
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -993,17 +770,27 @@ xkb_symbols "gyration" {
 // Hewlett-Packard Internet Keyboard
 partial alphanumeric_keys 
 xkb_symbols "hpi6" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
+    key <I02>   {       [ XF86HomePage          ]       };
     key <I12>	{	[ XF86Search		]	};
+    key <I14>	{	[ XF86VendorHome	]	};
+    key <I15>	{	[ XF86Community		]	};
+    key <I16>	{	[ XF86AudioMedia	]	};
+    key <I18>	{	[ XF86Eject		]	};
+    key <I1E>	{	[ XF86Shop		]	};
+    key <I1F>	{	[ XF86Launch1		]	};
     key <I26>	{	[ Help			]	};
-    key <I5F>	{	[ XF86Standby		]	};
+    key <I27>	{	[ XF86Finance		]	};
+    key <I39>	{	[ Print			]	};
+    key <I75>   {       [ Help                  ]       };
 };
 
-// Hewlett-Packard SK-2501 Multimedia Keyboard
+// Hewlett-Packard SK-2501, SK-2505 Multimedia Keyboard
 partial alphanumeric_keys
-xkb_symbols "hp2501" {
+xkb_symbols "hp250x" {
     key <I12>	{	[ XF86Tools		]	};
     key <I17>	{	[ XF86Search		]	};
+    key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Launch5		]	};
@@ -1017,57 +804,6 @@ xkb_symbols "hp2501" {
     key <I32>	{	[ XF86WWW		]	};
 };
 
-// Hewlett-Packard SK-2505 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp2505" {
-    include "inet(media_common)"
-    key <I18>	{	[ XF86Eject		]	};
-    key <I1E>	{	[ XF86Mail		]	};
-    key <I25>	{	[ XF86Standby		]	};
-    key <I32>	{	[ XF86WWW		]	};
-};
-
-// Hewlett-Packard 5181 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5181" {
-    include "inet(media_common)"
-    key <I12>	{	[ XF86Search		]	};
-    key <I14>	{	[ XF86VendorHome	]	};
-    key <I15>	{	[ XF86Community		]	};
-    key <I16>	{	[ XF86AudioMedia	]	};
-    key <I18>	{	[ XF86Eject		]	};
-    key <I1E>	{	[ XF86Shop		]	};
-    key <I1F>	{	[ XF86Launch1		]	};
-    key <I26>	{	[ Help			]	};
-    key <I27>	{	[ XF86Finance		]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I39>	{	[ Print			]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-// Hewlett-Packard 5185 Internet Keyboard
-partial alphanumeric_keys
-xkb_symbols "hp5185" {
-    include "inet(media_common)"
-    key <I02>   {       [ XF86WWW               ]       };
-    key <I12>   {       [ XF86Go                ]       };
-    key <I14>   {       [ XF86VendorHome        ]       };
-    key <I15>   {       [ XF86Community         ]       };
-    key <I16>   {       [ XF86AudioMedia        ]       };
-    key <I18>   {       [ XF86Eject             ]       };
-    key <I1E>   {       [ XF86Shop              ]       };
-    key <I1F>   {       [ XF86Pictures          ]       };
-    key <I26>   {       [ Help                  ]       };
-    key <I27>   {       [ XF86Finance           ]       };
-    key <I32>   {       [ XF86WWW               ]       };
-    key <I39>   {       [ Print                 ]       };
-    key <I5F>   {       [ XF86Standby           ]       };
-    key <I65>   {       [ XF86Search            ]       };
-    key <I6C>   {       [ XF86Mail              ]       };
-    key <I75>   {       [ Help                  ]       };
-};
-
 // Hewlett-Packard Omnibook XE3 GC, GD, GE and Pavilion N5xxx
 partial alphanumeric_keys
 xkb_symbols "hpxe3gc" {
@@ -1088,9 +824,7 @@ xkb_symbols "hpxe3gf" {
     // Describes the OneTouch buttons on HP Omnibook XE3 GF models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I73>	{	[ Help			]	};
     key <I74>	{	[ XF86Launch1		]	};
 };
@@ -1101,9 +835,7 @@ xkb_symbols "hpxt1000" {
     // Describes the OneTouch buttons on HP Omnibook XT1000 models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I71>	{	[ XF86Launch3		]	};
     key <I72>	{	[ Help			]	};
     key <I73>	{	[ XF86Launch2		]	};
@@ -1116,25 +848,34 @@ xkb_symbols "hpzt11xx" {
     // Describes the OneTouch buttons on HP Pavilion ZT11xx models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I71>	{	[ XF86Launch3		]	};
     key <I72>	{	[ Help			]	};
     key <I73>	{	[ XF86Launch2		]	};
     key <I74>	{	[ XF86Launch1		]	};
 };
 
+// Hewlett-Packard Pavilion dv5
+partial alphanumeric_keys
+xkb_symbols "hpdv5" {
+    // Describes the OneTouch buttons on HP Pavilion dv5 models.
+    // See http://sourceforge.net/projects/omke for details on enabling
+    // these keys
+    include "inet(media_common)"
+    key <I12>  {       [ XF86ScreenSaver       ]       };
+    key <I32>  {       [ XF86WWW               ]       };
+    key <I75>  {       [ Help                  ]       };
+    key <K6D>  {       [ XF86Launch1           ]       };
+};
+
 // Hewlett-Packard Omnibook XE4xxx and ZE4xxx
 partial alphanumeric_keys
 xkb_symbols "hpxe4xxx" {
     // Describes the OneTouch buttons on HP Omnibook XE4xxx and ZE4xxx
-    // See http://sourceforge.net/projects/omke for details on enabling
     // models.
+    // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    include "inet(media_common)"
-    key <I32>	{	[ XF86WWW		]	};
-    key <I6C>	{	[ XF86Mail		]	};
+    include "inet(media_nav_common)"
     key <I70>	{	[ Help			]	};
     key <I71>	{	[ XF86Launch2		]	};
     key <I73>	{	[ XF86Launch1		]	};
@@ -1164,7 +905,6 @@ xkb_symbols "hp5xx" {
 
 // Honeywell
 
-
 // Honeywell Euroboard
 partial alphanumeric_keys
 xkb_symbols "honeywell_euroboard" {
@@ -1214,6 +954,7 @@ xkb_symbols "rapidaccess" {
 // IBM Rapid Access II
 partial alphanumeric_keys 
 xkb_symbols "rapidaccess2" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86AudioNext		]	};
     key <I17>	{	[ XF86Favorites		]	};
     key <I1E>	{	[ XF86AudioMute		]	};
@@ -1227,75 +968,40 @@ xkb_symbols "rapidaccess2" {
     key <I2E>	{	[ XF86Search		]	};
     key <I30>	{	[ XF86MyComputer	]	};
     key <I32>	{	[ XF86VendorHome	]	};
-    key <I5F>	{	[ XF86Standby		]	};
-};
-
-// IBM Rapid Access II (alternate option)
-partial alphanumeric_keys
-xkb_symbols "rapidaccess2a" {
-    key <I12>	{	[ XF86AudioNext		]	};
-    key <I17>	{	[ XF86Favorites		]	};
-    key <I1E>	{	[ XF86AudioMute		]	};
-    key <I20>	{	[ XF86AudioStop		]	};
-    key <I21>	{	[ XF86AudioLowerVolume	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I23>	{	[ XF86AudioRaiseVolume	]	};
-    key <I24>	{	[ XF86AudioPrev		]	};
-    key <I25>	{	[ XF86WWW		]	};
-    key <I26>	{	[ XF86Shop		]	};
-    key <I2E>	{	[ Help			]	};
-    key <I30>	{	[ XF86Option		]	};
-    key <I32>	{	[ XF86VendorHome	]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <MENU>	{	[ Menu			]	};
 };
 
-// IBM ThinkPad 41
-partial alphanumeric_keys
-xkb_symbols "thinkpad" {
-    include "inet(media_nav_common)"
-};
-
-
 // IBM ThinkPad 60 series
 partial alphanumeric_keys
 xkb_symbols "thinkpad60" {
     include "inet(media_nav_common)"
-
     key <I1F> { [ XF86VendorHome ] };
 };
 
-
 // IBM Space Saver
 partial alphanumeric_keys
 xkb_symbols "ibm_spacesaver" {
-    key <NMLK>  { [ Num_Lock, Num_Lock ] };
+    key <NMLK>  {
+        type="ONE_LEVEL",
+        symbols[Group1]= [ Num_Lock ]
+    };
 };
 
 // Logitech
 
 // Logitech common definitions
-partial alphanumeric_keys
+partial hidden alphanumeric_keys
 xkb_symbols "logitech_base" {
-
-    include "inet(media_nav_common)"
-    key <I01> {	[ XF86AudioMedia ] };
-    key <I02> { [ XF86WWW ] };
+    include "inet(media_nav_acpi_common)"
+    key <I02> { [ XF86HomePage ] };
     key <I15> { [ XF86Community ] };
     key <I16> { [ XF86ScrollClick ] };
     key <I21> {	[ XF86VendorHome ] };
-    key <I32> { [ XF86HomePage ] };
     key <I3B> { [ XF86New ] };
     key <I3C> { [ XF86Reply ] };
     key <I43> { [ XF86MyComputer ] };
     key <I44> { [ XF86Documents ] };
     key <I57> { [ XF86Pictures ] };
     key <I58> { [ XF86Music ] };
-    key <I5F> { [ XF86Standby ] };
-    key <I65> { [ XF86Search ] };
-    key <I66> {	[ XF86Favorites	] };
-    key <I6C> { [ XF86Mail ] };
-    key <I6D> { [ XF86AudioMedia ] };
 };
 
 // Logitech second set of common keys
@@ -1322,12 +1028,10 @@ xkb_symbols "logitech_set3" {
 partial alphanumeric_keys
 xkb_symbols "logiaccess" {
     include "inet(logitech_base)"
-
     key <FK13>	{	[ XF86MailForward	]	}; 
     key <FK14>	{	[ XF86Send		]	}; 
     key <I11>	{	[ XF86Messenger		]	};
     key <I12>	{	[ XF86WebCam		]	};
-    key <I65>	{	[ XF86Search		]	}; 
 };
 
 // Logitech Cordless Desktop (alternate option)
@@ -1351,16 +1055,13 @@ xkb_symbols "logicink" {
 partial alphanumeric_keys
 xkb_symbols "logiex110" {
     include "inet(logitech_base)"
-
     key <I2F>   {       [ XF86Close             ]       };      // Close
-    key <I21>   {       [ XF86Calculator        ]       };
 
 // Extended function keys
 // In the Console before starting X
 // Using setkeycodes e03b 212 e03c 213 e03d 214 e03e 215 e03f 216 e040 217 
 //       setkeycodes e041 218 e042 219 e043 220 e044 221 e057 222 e058 223 6d 206
 // *=keys that are there but need different symbol names.
-
     key <I3B>   {       [ Help                  ]       };      // F1
     key <FK13>  {       [ XF86Word              ]       };      // F2
     key <FK14>  {       [ XF86Excel             ]       };      // F3
@@ -1379,7 +1080,6 @@ xkb_symbols "logiex110" {
 partial alphanumeric_keys
 xkb_symbols "logiinkse" {
     include "inet(logitech_base)"
-
     key <FK13>	{	[ XF86MailForward	]	};	// F3
     key <FK14>	{	[ XF86Send		]	};	// F4
     key <FK15>	{	[ Undo			]	};	// F5
@@ -1403,7 +1103,6 @@ xkb_symbols "logiinkseusb" {
 partial alphanumeric_keys
 xkb_symbols "logiitc" {
     include "inet(logitech_base)"
-
     key <I2F> {	[ XF86AudioRaiseVolume ] };
 
     // Just to override RaiseVolume from logitech_base,
@@ -1416,7 +1115,6 @@ xkb_symbols "logiitc" {
 partial alphanumeric_keys
 xkb_symbols "logiik" {
     include "inet(logitech_base)"
-
     key <I12>	{	[ Find			]	};
     key <I17>	{	[ Print			]	};
     key <I18>	{	[ XF86Favorites		]	};
@@ -1436,7 +1134,6 @@ xkb_symbols "logiik" {
 partial alphanumeric_keys
 xkb_symbols "itouch" {
     include "inet(logitech_base)"
-
     key <I1F>	{	[ XF86AudioMute		]	};
     key <I2B>	{	[ XF86AudioLowerVolume	]	};
     key <I2D>	{	[ XF86AudioRaiseVolume	]	};
@@ -1455,13 +1152,11 @@ xkb_symbols "logiultraxc" {
 
 partial alphanumeric_keys 
 xkb_symbols "logidinovo" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I02>	{	[ XF86HomePage		]	};
     key <I12>	{	[ XF86Standby		]	};
     key <I17>	{	[ XF86Search		]	};
     key <I21>	{	[ XF86AudioRaiseVolume	]	};
-    key <I66>	{	[ XF86Start		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <K66>	{	[ XF86AudioLowerVolume	]	};
     key <KPDC>	{	[ XF86AudioMute		]	};
     key <XFER>	{	[ XF86AudioMedia	]	};
@@ -1469,20 +1164,60 @@ xkb_symbols "logidinovo" {
 
 partial alphanumeric_keys 
 xkb_symbols "logidinovoedge" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <FK17>  {       [ XF86Search            ]       };
     key <XFER>	{	[ XF86AudioMedia	]	};
 };
 
+partial alphanumeric_keys
+xkb_symbols "logitech_g15" {
+    include "inet(media_nav_acpi_common)"
+    key <AE13> {         [   XF86Messenger ] };
+    key <HKTG> {         [     XF86Launch7 ] };
+    key  <I02> {         [     XF86Launch9 ] };
+    key  <I04> {         [       XF86Phone ] };
+    key  <I08> {         [     XF86LaunchD ] };
+    key  <I09> {         [     XF86Support ] };
+    key  <I0F> {         [     XF86LaunchF ] };
+    key  <I16> {         [      XF86LogOff ] };
+    key  <I18> {         [     XF86Launch5 ] };
+    key  <I21> {         [      XF86Travel ] };
+    key  <I23> {         [       XF86Spell ] };
+    key  <I31> {         [     XF86Launch4 ] };
+    key  <I3C> {         [       XF86Music ] };
+    key  <I42> {         [     XF86Forward ] };
+    key  <I43> {         [        XF86Send ] };
+    key  <I57> {         [        XF86Save ] };
+    key  <I64> {         [    XF86Pictures ] };
+    key  <I67> {         [     XF86LaunchA ] };
+    key  <I76> {         [      XF86iTouch ] };
+    key  <I77> {         [     XF86Launch3 ] };
+    key  <I79> {         [    XF86ToDoList ] };
+    key  <I7B> {         [  XF86Calculator ] };
+    key  <K5A> {         [  XF86VendorHome ] };
+    key  <K5D> {         [        XF86Away ] };
+    key  <K5E> {         [      XF86WebCam ] };
+    key  <K5F> {         [     XF86Launch0 ] };
+    key  <K63> {         [     XF86Launch6 ] };
+    key  <K6D> {         [    XF86Calendar ] };
+    key  <K71> {         [     XF86LaunchB ] };
+    key  <K72> {         [     XF86LaunchC ] };
+    key  <K74> {         [         XF86WWW ] };
+    key  <K75> {         [     XF86LaunchE ] };
+    key <MDSW> {         [     XF86Launch1 ] };
+    key <NFER> {         [     XF86Launch2 ] };
+    key <XFER> {         [     XF86Launch8 ] };
+};
+
+
 // Memorex
 
 // Memorex MX1998
 partial alphanumeric_keys
 xkb_symbols "mx1998" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <DOWN>	{	[ XF86ScrollDown	]	};
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
@@ -1494,8 +1229,6 @@ xkb_symbols "mx1998" {
     key <I26>	{	[ Menu			]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I57>	{	[ XF86WakeUp		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I68>	{	[ XF86DOS		]	};
     key <I7A>	{	[ XF86ScreenSaver	]	};
     key <UP>	{	[ XF86ScrollUp		]	};
@@ -1504,7 +1237,7 @@ xkb_symbols "mx1998" {
 // Memorex MX2500 EZ-Access Keyboard
 partial alphanumeric_keys
 xkb_symbols "mx2500" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I12>	{	[ XF86Clear		]	};
     key <I13>	{	[ XF86Phone		]	};
     key <I14>	{	[ XF86DOS		]	};
@@ -1512,30 +1245,16 @@ xkb_symbols "mx2500" {
     key <I18>	{	[ XF86Xfer		]	};
     key <I1E>	{	[ XF86Eject		]	};
     key <I1F>	{	[ XF86Documents		]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I26>	{	[ XF86News		]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6B>	{	[ XF86WakeUp		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I6D>	{	[ XF86RotateWindows	]	};
-    key <LWIN>	{	[ Meta_L		]	};
-    key <MENU>	{	[ Menu			]	};
-    key <RWIN>	{	[ Meta_R		]	};
 };
 
 // Memorex MX2750
 partial alphanumeric_keys
 xkb_symbols "mx2750" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I32>	{	[ XF86Launch0		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -1549,17 +1268,12 @@ xkb_symbols "microsoft7000" {
     key <I09>	{	[ XF86New		]	};
     key <I0A>	{	[ Redo			]	};
     key <I0E>	{	[ XF86MailForward	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I2F>	{	[ XF86Close		]	};
-    key <I32>	{	[ XF86HomePage		]	};
     key <I39>	{	[ Print			]	};
     key <I55>	{	[ XF86Save		]	};
     key <I5A>	{	[ XF86Send		]	};
     key <I62>	{	[ Help			]	};
     key <I64>	{	[ XF86Reply		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I76>	{	[ parenleft		]	};
     key <I7B>	{	[ parenright		]	};
     key <K59>	{	[ KP_Equal		]	};
@@ -1571,34 +1285,8 @@ xkb_symbols "microsoft7000" {
 // Microsoft Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "microsoftinet" {
-    include "inet(nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
+    include "inet(nav_acpi_common)"
     key <I68>	{	[ XF86AudioStop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-};
-
-// Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
-partial alphanumeric_keys 
-xkb_symbols "microsoftpro" {
-    include "inet(media_nav_common)"
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86HomePage		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I6B>	{	[ XF86MyComputer	]	};
-    key <I6C>	{	[ XF86Mail		]	};
-    key <I6D>	{	[ XF86AudioMedia	]	};
-//   Internet Section -- Left Side
-//   Multimedia Section -- Right Side
-//   My Computer Section -- Far Right
 };
 
 // Microsoft Natural Keyboard Pro USB  
@@ -1611,16 +1299,11 @@ partial alphanumeric_keys
      key <I17>   {   [ XF86AudioStop      ]   };  
      key <I1E>   {   [ XF86AudioRaiseVolume   ]   };  
      key <I1F>   {   [ XF86AudioPlay, XF86AudioPause ] };  
-     key <I21>   {   [ XF86Calculator   ]   };  
      key <I22>   {   [ XF86AudioNext      ]   };  
      key <I24>   {   [ XF86AudioPrev      ]   };  
      key <I25>   {   [ XF86AudioLowerVolume   ]   };  
      key <I26>   {   [ XF86AudioMute      ]   };  
      key <I63>   {   [ XF86Standby      ]   };  
-     key <I65>   {   [ XF86Search      ]   };  
-     key <I66>   {   [ XF86Favorites      ]   };  
-     key <I68>   {   [ XF86Stop      ]   };  
-     key <I6C>   {   [ XF86Mail      ]   };  
  //   Internet Section -- Left Side  
  //   Multimedia Section -- Right Side  
  //   My Computer Section -- Far Right  
@@ -1633,14 +1316,8 @@ partial alphanumeric_keys
 xkb_symbols "microsoftprooem" { 
     include "inet(media_nav_common)"
     key <FK17>	{	[ XF86Search		]	}; 
-    key <I01>	{	[ XF86AudioMedia	]	}; 
     key <I02>	{	[ XF86HomePage		]	}; 
-    key <I21>	{	[ XF86Calculator	]	}; 
     key <I63>	{	[ XF86Standby		]	}; 
-    key <I66>	{	[ XF86Favorites		]	}; 
-    key <I67>	{	[ XF86Reload		]	}; 
-    key <I68>	{	[ XF86Stop		]	}; 
-    key <I6C>	{	[ XF86Mail		]	}; 
     key <K67>	{	[ XF86MyComputer	]	}; 
 //   Internet Section -- Left Side 
 //   Multimedia Section -- Right Side 
@@ -1656,16 +1333,12 @@ xkb_symbols "microsoftprose" {
     key <I17>	{	[ XF86AudioStop		]	};
     key <I1E>	{	[ XF86AudioRaiseVolume	]	};
     key <I1F>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I21>	{	[ XF86Calculator	]	};
     key <I22>	{	[ XF86AudioNext		]	};
     key <I24>	{	[ XF86AudioPrev		]	};
     key <I25>	{	[ XF86AudioLowerVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I63>	{	[ XF86Standby		]	};
-    key <I65>	{	[ XF86Search		]	};
-    key <I66>	{	[ XF86Favorites		]	};
     key <I68>	{	[ XF86AudioStop		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PRSC>	{	[ XF86MyComputer	]	};
     key <XFER>	{	[ XF86AudioMedia	]	};
 };
@@ -1673,12 +1346,11 @@ xkb_symbols "microsoftprose" {
 // Microsoft Office Keyboard
 partial alphanumeric_keys
 xkb_symbols "microsoftoffice" {
-    include "inet(nav_common)"
+    include "inet(nav_acpi_common)"
     key <BRK>	{	[ XF86Calendar		]	};
     key <END>	{	[ Undo			]	};
-    key <I02>	{	[ XF86WWW		]	};
+    key <I02>	{	[ XF86HomePage		]	};
     key <I1E>	{	[ XF86AudioLowerVolume	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I25>	{	[ XF86AudioRaiseVolume	]	};
     key <I26>	{	[ XF86AudioMute		]	};
     key <I3C>	{	[ XF86Cut		]	};
@@ -1686,15 +1358,13 @@ xkb_symbols "microsoftoffice" {
     key <I54>	{	[ XF86ApplicationLeft	]	};
     key <I55>	{	[ XF86TaskPane		]	};
     key <I56>	{	[ XF86Spell		]	};
-    key <I57>	{	[ XF86HomePage		]	};
+    key <I57>	{	[ XF86WWW		]	};
     key <I58>	{	[ XF86New		]	};
     key <I59>	{	[ XF86Open		]	};
     key <I5A>	{	[ XF86Close		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I62>	{	[ Help			]	};
     key <I64>	{	[ XF86Save		]	};
     key <I67>	{	[ Print			]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <I6D>	{	[ XF86OfficeHome	]	};
     key <I70>	{	[ Redo			]	};
     key <I71>	{	[ XF86Reply		]	};
@@ -1708,7 +1378,7 @@ xkb_symbols "microsoftoffice" {
 // Microsoft Wireless Multimedia Keyboard 1.0A 
 partial alphanumeric_keys 
 xkb_symbols "microsoftmult" { 
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <AE13>  {       [ XF86Messenger         ]       }; 
     key <FK14>	{	[ XF86New		]	}; 
     key <FK15>	{	[ XF86Open		]	}; 
@@ -1717,32 +1387,24 @@ xkb_symbols "microsoftmult" {
     key <I07>	{	[ Redo			]	}; 
     key <I08>	{	[ Undo			]	}; 
     key <I16>   {       [ XF86LogOff            ]       }; 
-    key <I21>   {       [ XF86Calculator        ]       }; 
     key <I23>	{	[ XF86Spell		]	}; 
-    key <I32>   {       [ XF86HomePage          ]       }; 
     key <I3B>	{	[ Help			]	}; 
     key <I3C>   {       [ XF86Music     ]       }; 
     key <I42>	{	[ XF86Forward		]	}; 
     key <I43>	{	[ XF86Send		]	}; 
     key <I57>	{	[ XF86Save		]	}; 
     key <I58>	{	[ Print			]	}; 
-    key <I5F>   {       [ XF86Sleep             ]       }; 
     key <I64>   {       [ XF86Pictures  ]       }; 
-    key <I6C>   {       [ XF86Mail              ]       }; 
-    key <I6D>   {       [ XF86AudioMedia        ]       }; 
     key <I80>   {       [ XF86Documents ]       }; 
-//   Control Section -- Far Right 
-//   F-Locked Function keys 
-//   Internet Section -- Right Side 
-//   Multimedia Section -- Centre 
-//   My Computer Section -- Left Side 
 }; 
 
+
 // Oretec
 
 // Oretec MCK-800 MM/Internet keyboard
 partial alphanumeric_keys
 xkb_symbols "oretec" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86ScrollUp		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I17>	{	[ XF86AudioPrev		]	};
@@ -1758,9 +1420,6 @@ xkb_symbols "oretec" {
     key <I2E>	{	[ XF86AudioNext		]	};
     key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86ZoomIn		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86AudioLowerVolume	]	};
 };
 
@@ -1818,7 +1477,7 @@ xkb_symbols "qtronix" {
 // Samsung SDM 4500P
 partial alphanumeric_keys
 xkb_symbols "samsung4500" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <AE13>	{	[ XF86Launch4		]	};
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
@@ -1827,21 +1486,17 @@ xkb_symbols "samsung4500" {
     key <I0A>	{	[ XF86Book		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I26>	{	[ Help			]	};
-    key <I32>	{	[ XF86WWW		]	};
     key <I59>	{	[ XF86Explorer		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <NFER>	{	[ XF86Launch2		]	};
 };
 
 // Samsung SDM 4510P
 partial alphanumeric_keys
 xkb_symbols "samsung4510" {
-    include "inet(media_common)"
+    include "inet(media_acpi_common)"
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <NFER>	{	[ XF86Launch2		]	};
 };
 
@@ -1863,24 +1518,23 @@ xkb_symbols "sk1300" {
 // SK-2500
 partial alphanumeric_keys
 xkb_symbols "sk2500" {
-    include "inet(media_common)"
+    include "inet(media_nav_common)"
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I19>	{	[ XF86Forward		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I23>	{	[ XF86Xfer		]	};
     key <I25>	{	[ XF86PowerOff		]	};
     key <I26>	{	[ Menu			]	};
-    key <I32>	{	[ XF86WWW		]	};
     key <I7A>	{	[ XF86ScreenSaver	]	};
 };
 
 // SK-6200
 partial alphanumeric_keys
 xkb_symbols "sk6200" {
+    include "inet(acpi_common)"
     key <I12>	{	[ XF86Favorites		]	};
     key <I14>	{	[ XF86AudioLowerVolume	]	};
     key <I16>	{	[ XF86AudioRaiseVolume	]	};
@@ -1893,8 +1547,6 @@ xkb_symbols "sk6200" {
     key <I23>	{	[ XF86AudioPrev		]	};
     key <I24>	{	[ XF86AudioStop		]	};
     key <I32>	{	[ XF86Mail		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
 };
 
 // SK-7100
@@ -1916,6 +1568,7 @@ xkb_symbols "sk7100" {
 // SVEN Ergonomic 2500
 partial alphanumeric_keys
 xkb_symbols "sven" {
+    include "inet(acpi_common)"
     key <I10>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I12>	{	[ XF86Forward		]	};
     key <I17>	{	[ XF86AudioRaiseVolume	]	};
@@ -1936,10 +1589,7 @@ xkb_symbols "sven" {
     key <I30>	{	[ XF86Favorites		]	};
     key <I31>	{	[ XF86ScrollUp		]	};
     key <I32>	{	[ XF86ScrollDown	]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I62>	{	[ XF86AudioNext		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
     key <I68>	{	[ XF86Back		]	};
 };
 
@@ -1957,6 +1607,7 @@ xkb_symbols "sven303" {
 // Symplon PaceBook (tablet PC)
 partial alphanumeric_keys
 xkb_symbols "symplon" {
+    include "inet(nav_acpi_common)"
     key <HOME>	{	[ XF86RotationPB	]	};
     key <I13>	{	[ XF86SplitScreen	]	};
     key <I14>	{	[ XF86Support		]	};
@@ -1964,10 +1615,7 @@ xkb_symbols "symplon" {
     key <I21>	{	[ XF86User2KB		]	};
     key <I25>	{	[ XF86RotationKB	]	};
     key <I26>	{	[ XF86MenuKB		]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
     key <I6B>	{	[ XF86User1KB		]	};
-    key <I6C>	{	[ XF86Mail		]	};
     key <PAUS>	{	[ XF86UserPB		]	};
     key <UP>	{	[ XF86MenuPB		]	};
 };
@@ -1994,14 +1642,9 @@ xkb_symbols "toshiba_s3000" {
 // Trust Wireless Keyboard Classic
 partial alphanumeric_keys
 xkb_symbols "trust" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I11>	{	[ XF86ScreenSaver	]	};
     key <I1E>	{	[ XF86Eject		]	};
-    key <I21>	{	[ XF86Calculator	]	};
-    key <I32>	{	[ XF86WWW		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-    key <I6C>	{	[ XF86Mail		]	};
 };
 
 
@@ -2013,7 +1656,6 @@ xkb_symbols "trustda" {
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I21>	{	[ XF86Calculator	]	};
     key <I23>	{	[ XF86Xfer		]	};
     key <I25>	{	[ XF86Standby		]	};
     key <I26>	{	[ Help			]	};
@@ -2027,6 +1669,7 @@ xkb_symbols "trustda" {
 // Yahoo! Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "yahoo" {
+    include "inet(acpi_common)"
     key <I11>	{	[ XF86AudioPrev		]	};
     key <I12>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I1E>	{	[ XF86AudioStop		]	};
@@ -2040,28 +1683,11 @@ xkb_symbols "yahoo" {
     key <I26>	{	[ Help			]	};
     key <I27>	{	[ XF86Mail		]	};
     key <I28>	{	[ XF86WWW		]	};
-    key <I5E>	{	[ XF86PowerOff		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I63>	{	[ XF86WakeUp		]	};
-};
-
-// Super Power Internet Keyboard 
- 
-// Super Power Multimedia Keyboard 
-xkb_symbols "sp_inet" { 
-    include "inet(media_nav_common)"
-    key <I32>	{	[ XF86HomePage		]	}; 
-    key <I5E>	{	[ XF86PowerOff		]	}; 
-    key <I5F>	{	[ XF86Standby		]	}; 
-    key <I63>	{	[ XF86WakeUp		]	};       
-    key <I66>	{	[ XF86Favorites		]	}; 
-    key <I67>	{	[ XF86Refresh		]	}; 
-    key <I68>	{	[ XF86Stop		]	}; 
-    key <I6C>	{	[ XF86Mail		]	}; 
 };
 
 // Apple keyboards (macbooks, powerbooks, powermac G5, etc)
-partial xkb_symbols "apple" {
+partial alphanumeric_keys
+xkb_symbols "apple" {
 // Really brightness up/down
     key <II65>  {       [ XF86BrightnessAdjust  ]       };
     key <I54>   {       [ XF86BrightnessAdjust  ]       };
@@ -2073,6 +1699,7 @@ partial xkb_symbols "apple" {
     key <I57>   {       [ XF86Launch0		]	};
     key <I58>	{	[ XF86Launch1    	]	};
     key <I59>	{	[ XF86Launch2   	]	};
+    key <I5E>	{	[ XF86PowerOff          ]       };
     key <K5D>	{	[ F13 ]    };
     key <K5E>	{	[ F14 ]    };
     key <K5F>	{	[ F15 ]    };
@@ -2083,41 +1710,27 @@ partial xkb_symbols "apple" {
 
 partial alphanumeric_keys
 xkb_symbols "cymotionlinux" {
-    include "inet(media_nav_common)"
-    key <FK17>	{	[	XF86Search		]	};
-    key <I02>	{	[	XF86WWW			]	};
-    key <I05>	{	[	Redo			]	};
+    include "inet(media_nav_acpi_common)"
     key <I07>	{	[	Undo			]	};
+    key <I0A>	{	[	Redo			]	};
     key <I0F>	{	[	XF86ScrollDown		]	};
     key <I17>	{	[	XF86Launch2		]	};
     key <I1F>	{	[	XF86Launch1		]	};
-    key <I21>	{	[	XF86Calculator		]	};
     key <I28>	{	[	XF86MenuKB		]	};
     key <I2B>	{	[	XF86Launch3		]	};
     key <I3C>	{	[	XF86Cut			]	};
-    key <I47>	{	[	XF86PowerOff		]	};
-    key <I63>   {	[	XF86Standby		]	};
-    key <I67>	{	[	XF86Reload		]	};
-    key	<I68>	{	[	XF86Stop		]	};
-    key <I6C>	{	[	XF86Mail		]	};
     key <I78>	{	[	XF86Copy		]	};
     key <K65>	{	[	XF86Paste		]	};
-    key <K68>	{	[	XF86Standby		]	};
     key <K6C>	{	[	XF86Eject		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
-    key	<RWIN>	{	[	at		]	};
     key <XFER>	{	[	XF86AudioMedia		]	};
 };
 
 partial alphanumeric_keys 
 xkb_symbols "silvercrest" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};    
     key <I21>	{	[ XF86Launch2		]	};
-    key <I5F>	{	[ XF86Standby		]	};
-    key <I66>	{	[ XF86Favorites		]	};    
-    key <I6C>	{	[ XF86Mail		]	};    
-    key <I6D>	{	[ XF86AudioMedia	]	};
     key <K67>	{	[ XF86Launch1		]	};
 };
 
@@ -2125,12 +1738,8 @@ xkb_symbols "silvercrest" {
 
 partial alphanumeric_keys
 xkb_symbols "emachines" {
-    include "inet(media_common)"
+    include "inet(media_nav_acpi_common)"
     key <I32>  {  [ XF86iTouch                    ]  };
-    key <I5F>  {  [ XF86Sleep                     ]  };
-    key <I65>  {  [ XF86Search                    ]  };
-    key <I6C>  {  [ XF86Mail                      ]  };
-    key <I6D>  {  [ XF86AudioMedia                ]  };
     key <KP0>  {  [ KP_0                          ]  };
     key <KP1>  {  [ KP_1                          ]  };
     key <KP2>  {  [ KP_2                          ]  };
@@ -2159,70 +1768,11 @@ xkb_symbols "emachines" {
 // setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
 partial alphanumeric_keys
 xkb_symbols "benqx" {
-    include "inet(media_nav_common)"
+    include "inet(media_nav_acpi_common)"
     key <I02> { [ XF86ModeLock ] };
     key <I21> { [ XF86WWW      ]  };
     key <I2B> { [ XF86Go ] };
     key <I31> { [ XF86Calendar ] };
-    key <I32> { [ XF86WWW ] };
-    key <I5E> { [ XF86PowerOff ]  };
-    key <I5F> { [ XF86ScreenSaver ] };
-    key <I63> { [ XF86WakeUp   ]  };
-    key <I65> { [ XF86Search ] };
-    key <I66> { [ XF86Favorites ] };
-    key <I6C> { [ XF86Mail ] };
-    key <I6D> { [ XF86AudioMedia ] };
-};
-
-partial alphanumeric_keys
-xkb_symbols "logitech_g15" {
-
-    include "inet(media_common)"
-    key <AE13> {         [   XF86Messenger ] };
-
-    key <HKTG> {         [     XF86Launch7 ] };
-
-    key  <I02> {         [     XF86Launch9 ] };
-    key  <I04> {         [       XF86Phone ] };
-    key  <I08> {         [     XF86LaunchD ] };
-    key  <I09> {         [     XF86Support ] };
-    key  <I0F> {         [     XF86LaunchF ] };
-    key  <I16> {         [      XF86LogOff ] };
-    key  <I18> {         [     XF86Launch5 ] };
-    key  <I21> {         [      XF86Travel ] };
-    key  <I23> {         [       XF86Spell ] };
-    key  <I31> {         [     XF86Launch4 ] };
-    key  <I32> {         [    XF86HomePage ] };
-    key  <I3C> {         [       XF86Music ] };
-    key  <I42> {         [     XF86Forward ] };
-    key  <I43> {         [        XF86Send ] };
-    key  <I57> {         [        XF86Save ] };
-    key  <I5F> {         [       XF86Sleep ] };
-    key  <I64> {         [    XF86Pictures ] };
-    key  <I67> {         [     XF86LaunchA ] };
-    key  <I6C> {         [        XF86Mail ] };
-    key  <I6D> {         [  XF86AudioMedia ] };
-    key  <I76> {         [      XF86iTouch ] };
-    key  <I77> {         [     XF86Launch3 ] };
-    key  <I79> {         [    XF86ToDoList ] };
-    key  <I7B> {         [  XF86Calculator ] };
- 
-    key  <K5A> {         [  XF86VendorHome ] };
-    key  <K5D> {         [        XF86Away ] };
-    key  <K5E> {         [      XF86WebCam ] };
-    key  <K5F> {         [     XF86Launch0 ] };
-    key  <K63> {         [     XF86Launch6 ] };
-    key  <K6D> {         [    XF86Calendar ] };
-    key  <K71> {         [     XF86LaunchB ] };
-    key  <K72> {         [     XF86LaunchC ] };
-    key  <K74> {         [         XF86WWW ] };
-    key  <K75> {         [     XF86LaunchE ] };
-
-    key <MDSW> {         [     XF86Launch1 ] };
-    key <NFER> {         [     XF86Launch2 ] };
-
-    key <XFER> {         [     XF86Launch8 ] };
-
 };
 
 // Intel
@@ -2234,3 +1784,30 @@ xkb_symbols "classmate" {
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
 };
 
+// Unitek
+
+partial alphanumeric_keys
+xkb_symbols "unitekkb1925" {
+    include "inet(media_nav_common)"
+    key <I0C> { [ XF86AudioMute ] };
+    key <I11> { [ XF86PowerOff ] };
+    key <I12> { [ XF86Sleep ] };
+    key <I16> { [ XF86WakeUp ] };
+    key <I18> { [ XF86Search ] };
+    key <I1A> { [ XF86Reload ] };
+};
+
+// Compal
+
+// Compal FL90
+partial alphanumeric_keys
+xkb_symbols "compalfl90" {
+    include "inet(media_nav_acpi_common)"
+    key <I54>   {       [ XF86MonBrightnessUp   ]       };
+    key <II65>  {       [ XF86MonBrightnessDown ]       };
+};
+
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+    include "inet(media_nav_acpi_common)"
+};