Serious restructuring in symbols/inet, b.fd.o#11746

1 files changed, 132 insertions, 446 deletions

diff --git a/symbols/inet b/symbols/inet
index 912ad1a6..c890689a 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -20,6 +20,18 @@
 // All keyboards listed here should be also mentioned in
 // xc/programs/xkbcomp/rules/xfree86, xfree86.lst and xfree86.xml.
 
+// Very common set of media keys
+partial hidden alphanumeric_keys
+xkb_symbols "media_common" {
+    key <I10>   {       [ XF86AudioPrev         ] };
+    key <I19>   {       [ XF86AudioNext         ] };
+    key <I20>   {       [ XF86AudioMute         ] };
+    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <I24>   {       [ XF86AudioStop, XF86AudioEject ] };
+    key <I2E>   {       [ XF86AudioLowerVolume  ] };	
+    key <I30>   {       [ XF86AudioRaiseVolume  ] };
+};
+
 // Evdev Standardized Keycodes
 partial alphanumeric_keys
 xkb_symbols "evdev" {
@@ -140,13 +152,7 @@ xkb_symbols "evdev" {
 // A4Tech KB-21
 partial alphanumeric_keys
 xkb_symbols "a4techKB21" {
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop, XF86Eject ]    };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };	
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    include "inet(media_common)"
     key <I32>   {       [ XF86HomePage          ]       };
     key <I65>   {       [ XF86Search            ]       };
     key <I66>   {       [ XF86Favorites         ]       };
@@ -170,14 +176,8 @@ xkb_symbols "a4techKBS8" {
 // A4Tech Wireless Desktop (RFKB-23)
 partial alphanumeric_keys
 xkb_symbols "a4_rfkb23" {
-    key <I10>   {       [ XF86AudioPrev                 ]       };
-    key <I19>   {       [ XF86AudioNext                 ]       };
-    key <I20>   {       [ XF86AudioMute                 ]       };
+    include "inet(media_common)"
     key <I21>   {       [ XF86Calculator                ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ]       };
-    key <I24>   {       [ XF86AudioStop                 ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume          ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume          ]       };
     key <I32>   {       [ XF86HomePage                  ]       };
     key <I32>   {       [ XF86WWW                       ]       };
     key <I5F>   {       [ XF86Sleep                     ]       };
@@ -213,12 +213,10 @@ xkb_symbols "airkey" {
 // From Alex Dubov <oakad@yahoo.com>
 partial alphanumeric_keys
 xkb_symbols "acer_ferrari4k" {
-    key <I20>   {       [ XF86AudioMute         ]       }; //Fn+F8
+    include "inet(media_common)"
     key <I24>   {       [ dollar                ]       };
     key <I25>   {       [ EuroSign              ]       };
     key <I26>   {       [ XF86Display           ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       }; //Fn+Down
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       }; //Fn+Up
     key <I32>   {       [ XF86WWW               ]       }; //"Saturn" button
     key <I6C>   {       [ XF86Mail              ]       }; //"mail" button
     // Missing keycodes - set-up with setkeycodes
@@ -229,6 +227,41 @@ xkb_symbols "acer_ferrari4k" {
     key <I74>   {       [ XF86Launch4           ]       };
 };
 
+// Acer Laptop (Generic layout for Acer laptops from 2004 onwards)
+// From Carlos Corbacho <cathectic@gmail.com>
+// Keys marked (HAL) require HAL 0.5.10 (or newer) to be set up correctly
+// (Your laptop must also be added to hal-info)
+// (Not all these keys will be available on every Acer laptop)
+partial alphanumeric_keys
+xkb_symbols "acer_laptop" {
+    include "inet(media_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)
+    key <I75>   {       [ Help                  ]        }; // Fn+F1 (HAL)
+    key <I79>   {       [ XF86Launch5           ]        }; // Fn+F7 (HAL)
+    key <K66>   {       [ XF86Launch3           ]        }; // Fn+F2 (HAL)
+
+    // Special Characters
+    // To avoid setting a precedent/ standard that will be broken in later
+    // versions of HAL, these keys are commented out for now. When they are no
+    // longer marked 'FIXME' and have saner keycodes, these two entries can be
+    // fixed and permanently uncommented. In the meantime, just uncomment these
+    // to make the keys work
+//  key <K5D>   {       [ EuroSign              ]        }; // Euro (HAL)
+//  key <K5E>   {       [ dollar                ]        }; // Dollar (HAL)
+};
+
 // Azona
 
 // Azona RF2300 wireless Internet Keyboard
@@ -269,14 +302,8 @@ xkb_symbols "acpi" {
 // Advance Scorpius KI
 partial alphanumeric_keys
 xkb_symbols "scorpius" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
+    include "inet(media_common)"
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86HomePage		]	};
     key <I5E>	{	[ XF86PowerOff		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -410,14 +437,8 @@ xkb_symbols "btc9001ah" {
 // BTC 5090
 partial alphanumeric_keys
 xkb_symbols "btc5090" {
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop         ]       };
+    include "inet(media_common)"
     key <I26>   {       [ XF86Start             ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I32>   {       [ XF86WWW               ]       };
     key <I33>   {       [ XF86Eject             ]       };
     key <I5E>   {       [ XF86PowerOff          ]       };
@@ -477,27 +498,21 @@ xkb_symbols "cherryblue" {
 // Cherry CyMotion Master XPress
 partial alphanumeric_keys
 xkb_symbols "cherryblueb" {
+    include "inet(media_common)"
     key <FK16>  {       [ XF86Reload            ]       };
     key <I02>   {       [ XF86HomePage          ]       };
     key <I07>   {       [ XF86Forward           ]       };
     key <I08>   {       [ XF86Back              ]       };
     key <I0A>   {       [ XF86Copy              ]       };
     key <I0B>	{	[ XF86ScrollUp		]	};
-    key <I10>   {       [ XF86Back              ]       };
     key <I12>   {       [ XF86ScrollDown        ]       };
     key <I17>   {       [ XF86Cut               ]       };
     key <I18>   {       [ XF86Paste             ]       };
-    key <I19>   {       [ XF86Forward           ]       };
     key <I1E>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
     key <I21>   {       [ XF86Calculator        ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop                 ] };
     key <I25>   {       [ XF86AudioLowerVolume  ]       };
     key <I26>   {       [ XF86AudioMute         ]       };
     key <I2C>   {       [ XF86Book              ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I32>   {       [ XF86Finance           ]       };
     key <I63>   {       [ XF86Standby                   ] };
     key <I65>   {       [ XF86Search            ]       };
@@ -518,14 +533,8 @@ xkb_symbols "cherryblueb" {
 // Cherry Blue Line CyBo@rd (alternate option)
 partial alphanumeric_keys
 xkb_symbols "cherrybluea" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
+    include "inet(media_common)"
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86HomePage		]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I65>	{	[ XF86Search		]	};
@@ -542,16 +551,10 @@ xkb_symbols "cherrybluea" {
 // Cherry CyBo@rd USB-Hub
 partial alphanumeric_keys
 xkb_symbols "cherrycyboard" {
+    include "inet(media_common)"
     key <FK17>    {   [ XF86Search        ]   };
     key <I02> {   [ XF86HomePage      ]   };
-    key <I10> {   [ XF86AudioPrev     ]   };
-    key <I19> {   [ XF86AudioNext     ]   };
-    key <I20> {   [ XF86AudioMute     ]   };
     key <I21> {   [ XF86Calculator    ]   };
-    key <I22> {   [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24> {   [ XF86AudioStop     ]   };
-    key <I2E> {   [ XF86AudioLowerVolume  ]   };
-    key <I30> {   [ XF86AudioRaiseVolume  ]   };
     key <I5F> {   [ XF86Standby       ]   };
     key <I66> {   [ XF86MyComputer    ]   };
     key <I67> {   [ XF86Reload        ]   };
@@ -641,17 +644,11 @@ xkb_symbols "compaqik7" {
 // Compaq Internet Keyboard (13 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik13" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
+    include "inet(media_common)"
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Go		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Search		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86WWW		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86Shop		]	};
     key <I5F>	{	[ XF86Standby		]	};
 };
@@ -659,21 +656,15 @@ xkb_symbols "compaqik13" {
 // Compaq Internet Keyboard (18 keys)
 partial alphanumeric_keys
 xkb_symbols "compaqik18" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86LightBulb		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Go		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Search		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86WWW		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86VendorHome	]	};
     key <I26>	{	[ XF86Community		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86Shop		]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I68>	{	[ Print			]	};
@@ -683,13 +674,11 @@ xkb_symbols "compaqik18" {
 // Laptop/notebook Compaq (eg. Armada, Evo) Laptop Keyboard
 partial alphanumeric_keys
 xkb_symbols "armada" {
+    include "inet(media_common)"
     key <I1A>	{	[ XF86Search		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86HomePage		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I23>	{	[ XF86WWW		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I59>   {       [ XF86Launch2           ]       }; // Battery Monitor 
     key <I5F>   {       [ XF86Standby           ]       }; 
     key <I6F>	{	[ XF86AudioMedia	]	};
@@ -699,16 +688,12 @@ xkb_symbols "armada" {
 // Laptop/notebook Compaq (eg. Presario) Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "presario" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I14>	{	[ XF86Q			]	};
     key <I18>	{	[ XF86Launch2		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Mail		]	};
     key <I1F>	{	[ XF86Launch1		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86WWW		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I32>	{	[ XF86Shop		]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I75>	{	[ XF86AudioMedia	]	};
@@ -740,59 +725,35 @@ xkb_symbols "dell" {
 // Genius KB-19e NB
 partial alphanumeric_keys
 xkb_symbols "geniuskb19e" {
-    key <I6A>   {      [ XF86Back              ]       };
-    key <I69>   {      [ XF86Forward           ]       };
-    key <I68>   {      [ XF86Stop              ]       };
-    key <I67>   {      [ XF86Refresh           ]       };
+    include "inet(media_common)"
+    key <I21>   {      [ XF86Calculator        ]       };
+    key <I32>   {      [ XF86HomePage          ]       };
+    key <I5F>   {      [ XF86Sleep             ]       };
     key <I65>   {      [ XF86Search            ]       };
     key <I66>   {      [ XF86Favorites         ]       };
-
-    key <I6D>   {      [ XF86AudioMedia        ]       };
-    key <I20>   {      [ XF86AudioMute         ]       };
-    key <I30>   {      [ XF86AudioRaiseVolume  ]       };
-    key <I2E>   {      [ XF86AudioLowerVolume  ]       };
-
-    key <I32>   {      [ XF86HomePage          ]       };
-    key <I6C>   {      [ XF86Mail              ]       };
-    key <I21>   {      [ XF86Calculator        ]       };
+    key <I67>   {      [ XF86Refresh           ]       };
+    key <I68>   {      [ XF86Stop              ]       };
+    key <I69>   {      [ XF86Forward           ]       };
+    key <I6A>   {      [ XF86Back              ]       };
     key <I6B>   {      [ XF86MyComputer        ]       };
-    key <I5F>   {      [ XF86Sleep             ]       };
-
-    key <I22>   {      [ XF86AudioPlay, XF86AudioPause ]       };
-    key <I24>   {      [ XF86AudioStop         ]       };
-    key <I10>   {      [ XF86AudioPrev         ]       };
-    key <I19>   {      [ XF86AudioNext         ]       };
-};
-
-// Dell USB Multimedia Keyboard
-partial alphanumeric_keys
-xkb_symbols "dellusbmm" {
-    include "inet(dell8135)"
+    key <I6C>   {      [ XF86Mail              ]       };
+    key <I6D>   {      [ XF86AudioMedia        ]       };
 };
 
-
 // Laptop/notebook Dell Inspiron 8xxx
 partial alphanumeric_keys
 xkb_symbols "inspiron" {
+    include "inet(media_common)"
     key <I02>   {       [ XF86AudioStop         ]       };
     key <I04>   {       [ XF86AudioNext         ]       };
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
     key <I21>   {       [ XF86Eject             ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <NFER>  {       [ XF86AudioPrev         ]       };
     key <XFER>  {       [ XF86AudioPlay, XF86AudioPause ] };
 };
 
 partial alphanumeric_keys
 xkb_symbols "latitude" {
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    include "inet(media_common)"
 };
 
 // Laptop/notebook Dell Precision-M series
@@ -800,45 +761,18 @@ 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>
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
+    include "inet(media_common)"
     key <I32>	{	[ XF86HomePage		]	};
 };
 
-
-// DELL SK-8125 Multimedia Keyboard
-partial alphanumeric_keys
-xkb_symbols "dell8125" {
-    // Describes the extra keys on SK-8125 Multimedia keyboard
-    // From Olivier Lahaye <olivier dot lahaye at motorola dot com>
-    key <I02>	{	[ XF86HomePage		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
-    key <I67>	{	[ XF86Reload		]	};
-    key <I68>	{	[ XF86Stop		]	};
-    key <I69>	{	[ XF86Forward		]	};
-    key <I6A>	{	[ XF86Back		]	};
-};
-
-
-// DELL SK-8135 Multimedia Keyboard
+// DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
 partial alphanumeric_keys
-xkb_symbols "dell8135" {
+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_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I67>	{	[ XF86Reload		]	};
     key <I68>	{	[ XF86Stop		]	};
     key <I69>	{	[ XF86Forward		]	};
@@ -854,10 +788,7 @@ xkb_symbols "dell8135" {
 // Dexxa Wireless Desktop Keyboard
 partial alphanumeric_keys
 xkb_symbols "dexxa" {
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86WWW		]	};
     key <I65>	{	[ XF86Search		]	};
     key <I66>	{	[ XF86Favorites		]	};
@@ -871,14 +802,8 @@ xkb_symbols "dexxa" {
 // Diamond 9801 / 9802 series
 partial alphanumeric_keys
 xkb_symbols "diamond" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
+    include "inet(media_common)"
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86HomePage		]	};
     key <I5E>	{	[ XF86PowerOff		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -901,14 +826,8 @@ partial alphanumeric_keys
 xkb_symbols "dtk2000" {
     // Describes the extra keys on a DTK2000 Internet keyboard.
     // From Radics Laszlo <garaboncias@mailbox.hu>
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
+    include "inet(media_common)"
     key <I21>   {       [ XF86Calculator        ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ]       };
-    key <I24>   {       [ XF86AudioStop         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I32>   {       [ XF86HomePage          ]       };
     key <I5E>   {       [ XF86PowerOff          ]       };
     key <I5F>   {       [ XF86Sleep             ]       };
@@ -930,13 +849,7 @@ xkb_symbols "dtk2000" {
 // Ennyah DKB-1008
 partial alphanumeric_keys
 xkb_symbols "ennyah_dkb1008" {
-    key <I10>   {	[ XF86AudioPrev		]	};
-    key <I19>   {	[ XF86AudioNext		]	};
-    key <I20>   {	[ XF86AudioMute		]	};
-    key <I22>   {	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86HomePage		]	};
     key <I5E>   {	[ XF86PowerOff		]	};
     key <I5F>   {	[ XF86Standby		]	};
@@ -980,11 +893,8 @@ 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_common)"
     key <I21>   {       [ XF86Calculator        ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ]       };
-    key <I24>   {       [ XF86AudioStop         ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I32>   {       [ XF86WWW	        ]       };
     key <I5F>   {       [ XF86Sleep             ]       };
     key <I69>   {       [ XF86Forward           ]       };
@@ -1001,9 +911,6 @@ xkb_symbols "geniuscomfy2" {
     // Describes the extra keys on a Genius Comfy KB-21e-Scroll
     // From Radics Laszlo <garaboncias@mailbox.hu>
     include "inet(geniuscomfy)"
-    key <I10>   {       [ XF86AudioPrev         ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
     key <I23>   {       [ Return                ]       };
     key <I65>   {       [ XF86Search            ]       };
     key <I66>   {       [ XF86Favorites         ]       };
@@ -1038,11 +945,9 @@ xkb_symbols "gyration" {
 // Hewlett-Packard Internet Keyboard
 partial alphanumeric_keys 
 xkb_symbols "hpi6" {
+    include "inet(media_common)"
     key <I12>	{	[ XF86Search		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I26>	{	[ Help			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I5F>	{	[ XF86Standby		]	};
 };
 
@@ -1067,38 +972,26 @@ xkb_symbols "hp2501" {
 // Hewlett-Packard SK-2505 Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "hp2505" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Mail		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86Standby		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
 };
 
 // Hewlett-Packard 5181 Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "hp5181" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86Search		]	};
     key <I14>	{	[ XF86VendorHome	]	};
     key <I15>	{	[ XF86Community		]	};
     key <I16>	{	[ XF86AudioMedia	]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Shop		]	};
     key <I1F>	{	[ XF86Launch1		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioStop		]	};
-    key <I24>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I26>	{	[ Help			]	};
     key <I27>	{	[ XF86Finance		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86HomePage		]	};
     key <I39>	{	[ Print			]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -1108,22 +1001,16 @@ xkb_symbols "hp5181" {
 // Hewlett-Packard 5185 Internet Keyboard
 partial alphanumeric_keys
 xkb_symbols "hp5185" {
-    key <I10>   {       [ XF86AudioPrev         ]       };
+    include "inet(media_common)"
     key <I12>   {       [ XF86Go                ]       };
     key <I14>   {       [ XF86VendorHome        ]       };
     key <I15>   {       [ XF86Community         ]       };
     key <I16>   {       [ XF86AudioMedia        ]       };
     key <I18>   {       [ XF86Eject             ]       };
-    key <I19>   {       [ XF86AudioNext         ]       };
     key <I1E>   {       [ XF86Shop              ]       };
     key <I1F>   {       [ XF86Pictures          ]       };
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>   {       [ XF86AudioStop         ]       };
     key <I26>   {       [ Help                  ]       };
     key <I27>   {       [ XF86Finance           ]       };
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       };
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I32>   {       [ XF86WWW               ]       };
     key <I39>   {       [ Print                 ]       };
     key <I5F>   {       [ XF86Standby           ]       };
@@ -1138,13 +1025,7 @@ xkb_symbols "hpxe3gc" {
     // HP Pavilion N52XX models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I71>	{	[ Help			]	};
     key <I72>	{	[ XF86Launch1		]	};
     key <I73>	{	[ XF86WWW		]	};
@@ -1157,13 +1038,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
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86WWW		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <I73>	{	[ Help			]	};
@@ -1176,13 +1051,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
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86WWW		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <I71>	{	[ XF86Launch3		]	};
@@ -1197,13 +1066,7 @@ xkb_symbols "hpzt11xx" {
     // Describes the OneTouch buttons on HP Pavilion ZT11xx models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86WWW		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <I71>	{	[ XF86Launch3		]	};
@@ -1219,9 +1082,7 @@ xkb_symbols "hpxe4xxx" {
     // See http://sourceforge.net/projects/omke for details on enabling
     // models.
     // these keys
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86WWW		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <I70>	{	[ Help			]	};
@@ -1245,12 +1106,7 @@ xkb_symbols "hp5xx" {
     // Describes the OneTouch buttons on HP Omnibook 5xx models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I73>	{	[ Help			]	};
     key <I74>	{	[ XF86Launch1		]	};
 };
@@ -1358,18 +1214,12 @@ xkb_symbols "thinkpad" {
 partial hidden alphanumeric_keys
 xkb_symbols "logitech_base" {
 
+    include "inet(media_common)"
     key <I01> {	[ XF86AudioMedia ] };
     key <I02> { [ XF86WWW ] };
-    key <I10> { [ XF86AudioPrev ] };
     key <I15> { [ XF86Community ] };
     key <I16> { [ XF86ScrollClick ] };
-    key <I19> { [ XF86AudioNext ] };
-    key <I20> { [ XF86AudioMute ] };
     key <I21> {	[ XF86VendorHome ] };
-    key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
-    key <I24> { [ XF86AudioStop ] };
-    key <I2E> { [ XF86AudioLowerVolume ] };
-    key <I30> { [ XF86AudioRaiseVolume ] };
     key <I32> { [ XF86HomePage ] };
     key <I3B> { [ XF86New ] };
     key <I3C> { [ XF86Reply ] };
@@ -1406,14 +1256,6 @@ xkb_symbols "logitech_set3" {
     key <XFER>  {       [ XF86AudioMedia        ]       };
 };
 
-//--------------------------------------------------------
-// Logitech Cordless Desktop
-partial alphanumeric_keys
-xkb_symbols "ltcd" {
-    include "inet(logitech_base)"
-    include "inet(logitech_set3)"
-};
-
 // Logitech Access Keyboard
 partial alphanumeric_keys
 xkb_symbols "logiaccess" {
@@ -1426,28 +1268,15 @@ xkb_symbols "logiaccess" {
     key <I65>	{	[ XF86Search		]	}; 
 };
 
-// Logitech Cordless Desktop iTouch
-partial alphanumeric_keys
-xkb_symbols "logicdit" {
-    include "inet(logitech_base)"
-};
-
-// Logitech Cordless Desktop Optical
-partial alphanumeric_keys
-xkb_symbols "logicdo" {
-    include "inet(logitech_base)"
-};
-
-// Logitech Cordless Desktop Pro
+// Logitech Cordless Desktop
 partial alphanumeric_keys
-xkb_symbols "logicdp" {
+xkb_symbols "logicd" {
     include "inet(logitech_base)"
-
 };
 
-// Logitech Cordless Desktop Pro (alternate option)
+// Logitech Cordless Desktop (alternate option)
 partial alphanumeric_keys
-xkb_symbols "logicdpa" {
+xkb_symbols "logicda" {
     include "inet(logitech_base)"
     include "inet(logitech_set3)"
 };
@@ -1456,19 +1285,12 @@ xkb_symbols "logicdpa" {
 partial alphanumeric_keys
 xkb_symbols "logicink" {
     include "inet(logitech_base)"
-
     key <I11>	{	[ XF86Shop		]	};
     key <I12>	{	[ XF86VendorHome	]	};
     key <I13>	{	[ XF86Finance		]	};
     key <I14>	{	[ XF86Start		]	};
 };
 
-// Logitech iTouch Internet Navigator Keyboard
-partial alphanumeric_keys
-xkb_symbols "logiciink" {
-    include "inet(logicink)"
-};
-
 // Logitech Cordless Desktop LX-300
 partial alphanumeric_keys
 xkb_symbols "logiclx300" {
@@ -1580,14 +1402,11 @@ xkb_symbols "logiultrax" {
 partial alphanumeric_keys 
 xkb_symbols "dinovo" {
 
+    include "inet(media_common)"
     key <I02>	{	[ XF86HomePage		]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
     key <I12>	{	[ XF86Standby		]	};
     key <I17>	{	[ XF86Search		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I21>	{	[ XF86AudioRaiseVolume	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I66>	{	[ XF86Start		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <K66>	{	[ XF86AudioLowerVolume	]	};
@@ -1600,22 +1419,16 @@ xkb_symbols "dinovo" {
 // Memorex MX1998
 partial alphanumeric_keys
 xkb_symbols "mx1998" {
+    include "inet(media_common)"
     key <DOWN>	{	[ XF86ScrollDown	]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Xfer		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Documents		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86Game		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86Calculator	]	};
     key <I26>	{	[ Menu			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I57>	{	[ XF86WakeUp		]	};
     key <I5E>	{	[ XF86PowerOff		]	};
@@ -1628,22 +1441,16 @@ xkb_symbols "mx1998" {
 // Memorex MX2500 EZ-Access Keyboard
 partial alphanumeric_keys
 xkb_symbols "mx2500" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86Clear		]	};
     key <I13>	{	[ XF86Phone		]	};
     key <I14>	{	[ XF86DOS		]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Xfer		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Eject		]	};
     key <I1F>	{	[ XF86Documents		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I26>	{	[ XF86News		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I5E>	{	[ XF86PowerOff		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -1658,13 +1465,7 @@ xkb_symbols "mx2500" {
 // Memorex MX2750
 partial alphanumeric_keys
 xkb_symbols "mx2750" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
+    include "inet(media_common)"
     key <I32>	{	[ XF86Launch0		]	};
     key <I5E>	{	[ XF86PowerOff		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -1697,14 +1498,8 @@ xkb_symbols "microsoftinet" {
 // Microsoft Natural Keyboard Pro / Microsoft Internet Keyboard Pro
 partial alphanumeric_keys 
 xkb_symbols "microsoftpro" {
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
+    include "inet(media_common)"
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86HomePage		]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I65>	{	[ XF86Search		]	};
@@ -1752,17 +1547,11 @@ partial alphanumeric_keys
 // Microsoft Natural Keyboard Pro OEM 
 partial alphanumeric_keys  
 xkb_symbols "microsoftprooem" { 
+    include "inet(media_common)"
     key <FK17>	{	[ XF86Search		]	}; 
     key <I01>	{	[ XF86AudioMedia	]	}; 
     key <I02>	{	[ XF86HomePage		]	}; 
-    key <I10>	{	[ XF86AudioPrev		]	}; 
-    key <I19>	{	[ XF86AudioNext		]	}; 
-    key <I20>	{	[ XF86AudioMute		]	}; 
     key <I21>	{	[ XF86Calculator	]	}; 
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] }; 
-    key <I24>	{	[ XF86AudioStop		]	}; 
-    key <I2E>	{	[ XF86AudioLowerVolume	]	}; 
-    key <I30>	{	[ XF86AudioRaiseVolume	]	}; 
     key <I63>	{	[ XF86Standby		]	}; 
     key <I66>	{	[ XF86Favorites		]	}; 
     key <I67>	{	[ XF86Reload		]	}; 
@@ -1839,6 +1628,7 @@ xkb_symbols "microsoftoffice" {
 // Microsoft Wireless Multimedia Keyboard 1.0A 
 partial alphanumeric_keys 
 xkb_symbols "microsoftmult" { 
+    include "inet(media_common)"
     key <AE13>  {       [ XF86Messenger         ]       }; 
     key <FK14>	{	[ XF86New		]	}; 
     key <FK15>	{	[ XF86Open		]	}; 
@@ -1846,16 +1636,9 @@ xkb_symbols "microsoftmult" {
     key <FK17>	{	[ XF86Reply		]	}; 
     key <I07>	{	[ Redo			]	}; 
     key <I08>	{	[ Undo			]	}; 
-    key <I10>   {       [ XF86AudioPrev         ]       }; 
     key <I16>   {       [ XF86LogOff            ]       }; 
-    key <I19>   {       [ XF86AudioNext         ]       }; 
-    key <I20>   {       [ XF86AudioMute         ]       }; 
     key <I21>   {       [ XF86Calculator        ]       }; 
-    key <I22>   {       [ XF86AudioPlay, XF86AudioPause ] }; 
     key <I23>	{	[ XF86Spell		]	}; 
-    key <I24>   {       [ XF86AudioStop         ]       }; 
-    key <I2E>   {       [ XF86AudioLowerVolume  ]       }; 
-    key <I30>   {       [ XF86AudioRaiseVolume  ]       }; 
     key <I32>   {       [ XF86HomePage          ]       }; 
     key <I3B>	{	[ Help			]	}; 
     key <I3C>   {       [ XF86Music     ]       }; 
@@ -1907,21 +1690,15 @@ xkb_symbols "oretec" {
 // Propeller Voyager (KTEZ-1000)
 partial alphanumeric_keys
 xkb_symbols "propeller" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Xfer		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Documents		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86Game		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86Calculator	]	};
     key <I26>	{	[ Menu			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I68>	{	[ XF86DOS		]	};
     key <I7A>	{	[ XF86Standby		]	};
@@ -1961,21 +1738,15 @@ xkb_symbols "qtronix" {
 // Samsung SDM 4500P
 partial alphanumeric_keys
 xkb_symbols "samsung4500" {
+    include "inet(media_common)"
     key <AE13>	{	[ XF86Launch4		]	};
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
     key <I06>	{	[ XF86Launch5		]	};
     key <I09>	{	[ XF86Close		]	};
     key <I0A>	{	[ XF86Book		]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I26>	{	[ Help			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I59>	{	[ XF86Explorer		]	};
     key <I5F>	{	[ XF86Standby		]	};
@@ -1986,16 +1757,10 @@ xkb_symbols "samsung4500" {
 // Samsung SDM 4510P
 partial alphanumeric_keys
 xkb_symbols "samsung4510" {
+    include "inet(media_common)"
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <NFER>	{	[ XF86Launch2		]	};
 };
@@ -2006,40 +1771,29 @@ xkb_symbols "samsung4510" {
 // SK-1300
 partial alphanumeric_keys
 xkb_symbols "sk1300" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Forward		]	};
     key <I20>	{	[ XF86WWW		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86Standby		]	};
     key <I26>	{	[ XF86Back		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86Stop		]	};
 };
 
 // SK-2500
 partial alphanumeric_keys
 xkb_symbols "sk2500" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I19>	{	[ XF86Forward		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86Xfer		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86PowerOff		]	};
     key <I26>	{	[ Menu			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I7A>	{	[ XF86ScreenSaver	]	};
 };
@@ -2066,19 +1820,13 @@ xkb_symbols "sk6200" {
 // SK-7100
 partial alphanumeric_keys
 xkb_symbols "sk7100" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86AudioPause	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Video		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Eject		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
-    key <I22>	{	[ XF86AudioPlay		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86CD		]	};
     key <I26>	{	[ XF86Display		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
 };
 
@@ -2141,15 +1889,12 @@ xkb_symbols "symplon" {
 // Toshiba Satellite S3000
 partial alphanumeric_keys
 xkb_symbols "toshiba_s3000" {
+    include "inet(media_common)"
     // Describes the Special buttons on Toshiba Satellite 3000 models.
     // See http://sourceforge.net/projects/omke for details on enabling
     // these keys
     key <I06>	{	[ XF86Launch1		]	};
-    key <I10>	{	[ XF86AudioPrev		]	};
     key <I13>	{	[ XF86Launch2		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[ XF86AudioStop, XF86Eject	]	};
     key <I71>	{	[ XF86WWW		]	};
     key <I73>	{	[ XF86Mail		]	};
     key <I75>	{	[ XF86AudioRaiseVolume	]	};
@@ -2161,16 +1906,10 @@ xkb_symbols "toshiba_s3000" {
 // Trust Wireless Keyboard Classic
 partial alphanumeric_keys
 xkb_symbols "trust" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I11>	{	[ XF86ScreenSaver	]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86Eject		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I63>	{	[ XF86WakeUp		]	};
@@ -2183,21 +1922,15 @@ xkb_symbols "trust" {
 // Trust Direct Access Keyboard
 partial alphanumeric_keys
 xkb_symbols "trustda" {
-    key <I10>	{	[ XF86AudioPrev		]	};
+    include "inet(media_common)"
     key <I12>	{	[ XF86AudioRewind	]	};
     key <I17>	{	[ XF86Close		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
     key <I1E>	{	[ XF86AudioRecord	]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Calculator	]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
     key <I23>	{	[ XF86Xfer		]	};
-    key <I24>	{	[ XF86AudioStop		]	};
     key <I25>	{	[ XF86Standby		]	};
     key <I26>	{	[ Help			]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I32>	{	[ XF86WWW		]	};
     key <I7A>	{	[ XF86Away		]	};
 };
@@ -2230,13 +1963,7 @@ xkb_symbols "yahoo" {
  
 // Super Power Multimedia Keyboard 
 xkb_symbols "sp_inet" { 
-    key <I10>	{	[ XF86AudioPrev		]	}; 
-    key <I19>	{	[ XF86AudioNext		]	}; 
-    key <I20>	{	[ XF86AudioMute		]	}; 
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] }; 
-    key <I24>	{	[ XF86AudioStop		]	}; 
-    key <I2E>	{	[ XF86AudioLowerVolume	]	}; 
-    key <I30>	{	[ XF86AudioRaiseVolume	]	}; 
+    include "inet(media_common)"
     key <I32>	{	[ XF86HomePage		]	}; 
     key <I5E>	{	[ XF86PowerOff		]	}; 
     key <I5F>	{	[ XF86Standby		]	}; 
@@ -2253,8 +1980,8 @@ xkb_symbols "sp_inet" {
 partial alphanumeric_keys
 xkb_symbols "acer_c300" {
 
-    key <I1F>   {       [ F13                   ]       };
     key <I17>   {       [ F14                   ]       };
+    key <I1F>   {       [ F13                   ]       };
     key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I2E>   {       [ XF86AudioLowerVolume  ]       };
     key <I20>   {       [ XF86AudioMute         ]       };
@@ -2265,17 +1992,6 @@ xkb_symbols "acer_c300" {
     key <I5E>   {       [ XF86Launch2           ]       };
 };
 
-// Acer Travelmate 800
-xkb_symbols "acer_tm_800" { 
-    key <I20>   {       [ XF86AudioMute         ]       };
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
-    key <I32>   {       [ XF86WWW               ]       };
-    key <I6C>	{	[ XF86Mail		]	};
-// There are other buttons (P1, P2, Fn-F2, Fn-F3 - but they 
-// don't generate scancodes. It is possible to map them to whatever user wants.
-};
-
 // Apple keyboards (macbooks, powerbooks, powermac G5, etc)
 partial xkb_symbols "apple" {
 // Really brightness up/down
@@ -2299,6 +2015,7 @@ partial xkb_symbols "apple" {
 
 partial alphanumeric_keys
 xkb_symbols "cymotionlinux" {
+    include "inet(media_common)"
     key	<RWIN>	{	[	at		]	};
     key	<I68>	{	[	XF86Stop		]	};
     key <FK17>	{	[	XF86Search		]	};
@@ -2306,18 +2023,11 @@ xkb_symbols "cymotionlinux" {
     key <I07>	{	[	Undo			]	};
     key <I0A>	{	[	Redo			]	};
     key <I0F>	{	[	XF86ScrollDown		]	};
-    key <I10>	{	[	XF86AudioPrev		]	};
     key <I17>	{	[	XF86Launch2		]	};
-    key <I19>	{	[	XF86AudioNext		]	};
     key <I1F>	{	[	XF86Launch1		]	};
-    key <I20>	{	[	XF86AudioMute		]	};
     key <I21>	{	[	XF86Calculator		]	};
-    key <I22>	{	[	XF86AudioPlay, XF86AudioPause	]	};
-    key <I24>	{	[	XF86AudioStop		]	};
     key <I28>	{	[	XF86MenuKB		]	};
     key <I2B>	{	[	XF86Launch3		]	};
-    key <I2E>	{	[	XF86AudioLowerVolume	]	};
-    key <I30>	{	[	XF86AudioRaiseVolume	]	};
     key <I3C>	{	[	XF86Cut			]	};
     key <I63>   {	[	XF86Standby		]	};
     key <I67>	{	[	XF86Reload		]	};
@@ -2334,15 +2044,9 @@ xkb_symbols "cymotionlinux" {
 
 partial alphanumeric_keys 
 xkb_symbols "silvercrest" {
+    include "inet(media_common)"
     key <I02>	{	[ XF86HomePage		]	};    
-    key <I10>	{	[ XF86AudioPrev		]	};
-    key <I19>	{	[ XF86AudioNext		]	};
-    key <I20>	{	[ XF86AudioMute		]	};
     key <I21>	{	[ XF86Launch2		]	};
-    key <I22>	{	[ XF86AudioPlay, XF86AudioPause ] };
-    key <I24>	{	[ XF86AudioStop		]	};
-    key <I2E>	{	[ XF86AudioLowerVolume	]	};
-    key <I30>	{	[ XF86AudioRaiseVolume	]	};
     key <I5F>	{	[ XF86Standby		]	};
     key <I66>	{	[ XF86Favorites		]	};    
     key <I69>	{	[ XF86Go		]	};
@@ -2356,13 +2060,7 @@ xkb_symbols "silvercrest" {
 
 partial alphanumeric_keys
 xkb_symbols "emachines" {
-    key <I10>  {  [ XF86AudioPrev                 ]  };
-    key <I19>  {  [ XF86AudioNext                 ]  };
-    key <I20>  {  [ XF86AudioMute                 ]  };
-    key <I22>  {  [ XF86AudioPlay, XF86AudioPause ]  };
-    key <I24>  {  [ XF86AudioStop                 ]  };
-    key <I2E>  {  [ XF86AudioLowerVolume          ]  };
-    key <I30>  {  [ XF86AudioRaiseVolume          ]  };
+    include "inet(media_common)"
     key <I32>  {  [ XF86iTouch                    ]  };
     key <I5F>  {  [ XF86Sleep                     ]  };
     key <I65>  {  [ XF86Search                    ]  };
@@ -2396,32 +2094,27 @@ xkb_symbols "emachines" {
 // setkeycodes e075 171 # KEY_CONFIG from /usr/include/linux/input.h
 partial alphanumeric_keys
 xkb_symbols "benqx" {
-     key <I02> { [ XF86ModeLock ] };
-     key <I10> { [ XF86AudioPrev ] };
-     key <I19> { [ XF86AudioNext ] };
-     key <I20> { [ XF86AudioMute ] };
-     key <I21> { [ XF86WWW      ]  };
-     key <I22> { [ XF86AudioPlay ] };
-     key <I24> { [ XF86AudioStop ] };
-     key <I2B> { [ XF86Go ] };
-     key <I2E> { [ XF86AudioLowerVolume ] };
-     key <I30> { [ XF86AudioRaiseVolume ] };
-     key <I31> { [ XF86Clock ] };
-     key <I32> { [ XF86WWW ] };
-     key <I5E> { [ XF86PowerOff ]  };
-     key <I5F> { [ XF86ScreenSaver ] };
-     key <I63> { [ XF86WakeUp   ]  };
-     key <I65> { [ XF86Search ] };
-     key <I66> { [ XF86Favorites ] };
-     key <I69> { [ XF86Forward ] };
-     key <I6A> { [ XF86Back ] };
-     key <I6C> { [ XF86Mail ] };
-     key <I6D> { [ XF86AudioMedia ] };
+    include "inet(media_common)"
+    key <I02> { [ XF86ModeLock ] };
+    key <I21> { [ XF86WWW      ]  };
+    key <I2B> { [ XF86Go ] };
+    key <I31> { [ XF86Clock ] };
+    key <I32> { [ XF86WWW ] };
+    key <I5E> { [ XF86PowerOff ]  };
+    key <I5F> { [ XF86ScreenSaver ] };
+    key <I63> { [ XF86WakeUp   ]  };
+    key <I65> { [ XF86Search ] };
+    key <I66> { [ XF86Favorites ] };
+    key <I69> { [ XF86Forward ] };
+    key <I6A> { [ XF86Back ] };
+    key <I6C> { [ XF86Mail ] };
+    key <I6D> { [ XF86AudioMedia ] };
 };
 
 partial alphanumeric_keys
 xkb_symbols "logitech_g15" {
 
+    include "inet(media_common)"
     key <AE13> {         [   XF86Messenger ] };
 
     key <HKTG> {         [     XF86Launch7 ] };
@@ -2431,17 +2124,10 @@ xkb_symbols "logitech_g15" {
     key  <I08> {         [     XF86LaunchD ] };
     key  <I09> {         [     XF86Support ] };
     key  <I0F> {         [     XF86LaunchF ] };
-    key  <I10> {         [   XF86AudioPrev ] };
     key  <I16> {         [      XF86LogOff ] };
     key  <I18> {         [     XF86Launch5 ] };
-    key  <I19> {         [   XF86AudioNext ] };
-    key  <I20> {         [   XF86AudioMute ] };
     key  <I21> {         [      XF86Travel ] };
-    key  <I22> {         [   XF86AudioPlay ] };
     key  <I23> {         [       XF86Spell ] };
-    key  <I24> {         [   XF86AudioStop ] };
-    key  <I2E> {         [ XF86AudioLowerVolume ] };
-    key  <I30> {         [ XF86AudioRaiseVolume ] };
     key  <I31> {         [     XF86Launch4 ] };
     key  <I32> {         [    XF86HomePage ] };
     key  <I3C> {         [       XF86Music ] };