Merge remote-tracking branch 'origin/released'

* origin/released:
  Switched to xcalc-1.0.5
  Switched to bdftopcf-1.0.4
  libxtrans fontconfig glproto libX11 libXau libXext libXft libXinerama libXmu libfontenc mesa xkeyboard-config

34 files changed, 1731 insertions, 2908 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
index cc4c5b620..d738a9f82 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/Makefile.am
@@ -6,5 +6,5 @@ dist_symbols_DATA = \
  fi fr gb gr it \
  jp kr lt lv nl \
  no pl pt ro ru \
- se sk solaris tr tuv \
+ se sk solaris tr \
  tw ua us
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
index 70e1b9b90..53ad9177e 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,90 +27,105 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+default partial alphanumeric_keys
+xkb_symbols "sun_type6" {
+
+    name[Group1]= "Arabic (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
-partial default alphanumeric_keys 
-xkb_symbols "type6" {
-
-    name[Group1]= "Arabic";
-
-    key <TLDE> {  [   Arabic_thal,      Arabic_shadda, grave,    asciitilde   ]	};
-    key <AE01> {  [               1,          exclam, 1,          exclam      ] };
-    key <AE02> {  [               2,              at, 2,              at      ] };
-    key <AE03> {  [               3,      numbersign, 3,      numbersign      ] };
-    key <AE04> {  [               4,          dollar, 4,          dollar      ] };
-    key <AE05> {  [               5,         percent, 5,         percent      ] };
-    key <AE06> {  [               6,     asciicircum, 6,     asciicircum      ] };
-    key <AE07> {  [               7,       ampersand, 7,       ampersand      ] };
-    key <AE08> {  [               8,        asterisk, 8,        asterisk      ] };
-    key <AE09> {  [               9,      parenright, 9,      parenright      ] };
-    key <AE10> {  [               0,       parenleft, 0,       parenleft      ] };
-    key <AE11> {  [       minus,      underscore, minus,      underscore      ] };
-    key <AE12> {  [       equal,            plus, equal,            plus      ] };
+    key <TLDE> { [ Arabic_thal, Arabic_shadda, grave,  asciitilde ] };
+    key <AE01> { [   0x1000661,        exclam, 1,          exclam ] };
+    key <AE02> { [   0x1000662,            at, 2,              at ] };
+    key <AE03> { [   0x1000663,    numbersign, 3,      numbersign ] };
+    key <AE04> { [   0x1000664,        dollar, 4,          dollar ] };
+    key <AE05> { [   0x1000665,       percent, 5,         percent ] };
+    key <AE06> { [   0x1000666,   asciicircum, 6,     asciicircum ] };
+    key <AE07> { [   0x1000667,     ampersand, 7,       ampersand ] };
+    key <AE08> { [   0x1000668,      asterisk, 8,        asterisk ] };
+    key <AE09> { [   0x1000669,    parenright, 9,      parenright ] };
+    key <AE10> { [   0x1000660,     parenleft, 0,       parenleft ] };
+    key <AE11> { [       minus,    underscore, minus,  underscore ] };
+    key <AE12> { [       equal,          plus, equal,        plus ] };
 						
-    key <AD01> {  [      Arabic_dad,     Arabic_fatha, q,    Q     ]     };
-    key <AD02> {  [      Arabic_sad,     Arabic_fathatan, w,    W  ]     };
-    key <AD03> {  [     Arabic_theh,     Arabic_damma, e,    E     ]     };
-    key <AD04> {  [      Arabic_qaf,     Arabic_dammatan, r,    R  ]     };
-    key <AD05> {  [      Arabic_feh,     0x100fef9, t,    T        ]     };
-    key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef, y,    Y ]     };
-    key <AD07> {  [      Arabic_ain,         grave, u,    U        ]     };
-    key <AD08> {  [       Arabic_ha,        division, i,    I      ]     };
-    key <AD09> {  [     Arabic_khah,       multiply, o,    O       ]     };
-    key <AD10> {  [      Arabic_hah,   Arabic_semicolon, p,    P  ]     };
-    key <AD11> {  [     Arabic_jeem,        greater, bracketleft,  braceleft       ]     };
-    key <AD12> {  [      Arabic_dal,        less,    bracketright, braceright      ]     };
-
-    key <AC01> {  [    Arabic_sheen,   Arabic_kasra, a,    A       ]     };
-    key <AC02> {  [     Arabic_seen,   Arabic_kasratan, s,    S    ]     };
-    key <AC03> {  [      Arabic_yeh,       bracketright, d,    D   ]     };
-    key <AC04> {  [      Arabic_beh,       bracketleft, f,    F    ]     };
-    key <AC05> {  [      Arabic_lam,       0x100fef7, g,    G      ]     };
-    key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef, h,    H ]     };
-    key <AC07> {  [      Arabic_teh,      Arabic_tatweel, j,    J  ]     };
-    key <AC08> {  [     Arabic_noon,      Arabic_comma, k,    K    ]     };
-    key <AC09> {  [     Arabic_meem,         slash, l,    L        ]     };
-    key <AC10> {  [      Arabic_kaf,           colon, semicolon,    colon      ]     };
-    key <AC11> {  [      Arabic_tah,        quotedbl, apostrophe,   quotedbl      ]     };
-    key <BKSL> {  [       backslash,             bar, backslash,             bar      ]     };
-
-    key <LSGT> {  [             bar,      brokenbar, bar,      brokenbar	  ]     };
-    key <AB01> {  [Arabic_hamzaonyeh,    asciitilde, z,    Z       ]     };
-    key <AB02> {  [    Arabic_hamza,      Arabic_sukun, x,    X    ]     };
-    key <AB03> {  [Arabic_hamzaonwaw,      braceright, c,    C     ]     };
-    key <AB04> {  [       Arabic_ra,       braceleft, v,    V      ]     };
-    key <AB05> {  [       0x100fefb,       0x100fef5, b,    B      ]     };
-    key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef, n,    N ]     };
-    key <AB07> {  [Arabic_tehmarbuta,    apostrophe, m,    M       ]     };
-    key <AB08> {  [      Arabic_waw,         comma,  comma,    less        ]     };
-    key <AB09> {  [     Arabic_zain,         period, period,    greater       ]     };
-    key <AB10> {  [      Arabic_zah, Arabic_question_mark, slash,    question ]     };
+    key <AD01> { [   Arabic_dad, Arabic_fatha,          q,            Q          ] };
+    key <AD02> { [   Arabic_sad, Arabic_fathatan,       w,            W          ] };
+    key <AD03> { [  Arabic_theh, Arabic_damma,          e,            E          ] };
+    key <AD04> { [   Arabic_qaf, Arabic_dammatan,       r,            R          ] };
+    key <AD05> { [   Arabic_feh, 0x100fef9,             t,            T          ] };
+    key <AD06> { [ Arabic_ghain, Arabic_hamzaunderalef, y,            Y          ] };
+    key <AD07> { [   Arabic_ain, grave,                 u,            U          ] };
+    key <AD08> { [    Arabic_ha, division,              i,            I          ] };
+    key <AD09> { [  Arabic_khah, multiply,              o,            O          ] };
+    key <AD10> { [   Arabic_hah, Arabic_semicolon,      p,            P          ] };
+    key <AD11> { [  Arabic_jeem, greater,               bracketleft,  braceleft  ] };
+    key <AD12> { [   Arabic_dal, less,                  bracketright, braceright ] };
+
+    key <AC01> { [ Arabic_sheen, Arabic_kasra,       a,          A        ] };
+    key <AC02> { [  Arabic_seen, Arabic_kasratan,    s,          S        ] };
+    key <AC03> { [   Arabic_yeh, bracketright,       d,          D        ] };
+    key <AC04> { [   Arabic_beh, bracketleft,        f,          F        ] };
+    key <AC05> { [   Arabic_lam, 0x100fef7,          g,          G        ] };
+    key <AC06> { [  Arabic_alef, Arabic_hamzaonalef, h,          H        ] };
+    key <AC07> { [   Arabic_teh, Arabic_tatweel,     j,          J        ] };
+    key <AC08> { [  Arabic_noon, Arabic_comma,       k,          K        ] };
+    key <AC09> { [  Arabic_meem, slash,              l,          L        ] };
+    key <AC10> { [   Arabic_kaf, colon,              semicolon,  colon    ] };
+    key <AC11> { [   Arabic_tah, quotedbl,           apostrophe, quotedbl ] };
+    key <BKSL> { [    backslash, bar,                backslash,  bar      ] };
+
+    key <LSGT> { [                bar,            brokenbar,    bar, brokenbar ] };
+    key <AB01> { [  Arabic_hamzaonyeh,           asciitilde,      z, Z         ] };
+    key <AB02> { [       Arabic_hamza,         Arabic_sukun,      x, X         ] };
+    key <AB03> { [  Arabic_hamzaonwaw,           braceright,      c, C         ] };
+    key <AB04> { [          Arabic_ra,            braceleft,      v, V         ] };
+    key <AB05> { [          0x100fefb,            0x100fef5,      b, B         ] };
+    key <AB06> { [ Arabic_alefmaksura,   Arabic_maddaonalef,      n, N         ] };
+    key <AB07> { [  Arabic_tehmarbuta,           apostrophe,      m, M         ] };
+    key <AB08> { [         Arabic_waw,                comma,  comma, less      ] };
+    key <AB09> { [        Arabic_zain,               period, period, greater   ] };
+    key <AB10> { [         Arabic_zah, Arabic_question_mark,  slash, question  ] };
 
 	include "level3(ralt_switch)"
 
 };
 
-
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ara(type6)"
+	include "sun_vndr/ara(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "ara(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "azerty" {
+	include "ara(azerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "digits" {
+	include "ara(digits)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_digits" {
+	include "ara(qwerty_digits)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "azerty_digits" {
+	include "ara(azerty_digits)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "buckwalter" {
+	include "ara(buckwalter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ara(olpc)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index 202e8a4c1..5d66f34b6 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Belgium";
+    name[Group1]="Belgium (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [twosuperior, threesuperior                         ] };
     key <AE01>  { [ ampersand,          1,          bar               ] };
@@ -91,8 +71,57 @@ xkb_symbols "type6" {
 
 };
 
-
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/be(type6)"
+	include "sun_vndr/be(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "be(oss)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_frbe" {
+	include "be(oss_frbe)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "be(oss_latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "be(oss_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "be(oss_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "iso-alternate" {
+	include "be(iso-alternate)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "be(sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "be(Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "be(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "wang" {
+	include "be(wang)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
index 7ad2dd1cf..3651f9c81 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Brazil";
+    name[Group1]= "Portuguese (Brazil, Sun Type 6/7)";
+ 
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [      apostrophe,        quotedbl,	notsign		               ] };
     key <AE01> { [               1,          exclam,	onesuperior,        exclamdown ] };
@@ -94,8 +75,47 @@ xkb_symbols "type6" {
 
 };
 
-
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/br(type6)"
+	include "sun_vndr/br(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "abnt2" {
+	include "br(abnt2)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "br(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "thinkpad" {
+	include "br(thinkpad)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "br(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "br(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+	include "br(nativo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "br(nativo-us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "br(nativo-epo)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 4705123dc..114ef3a7a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
+   name[Group1]="Multilingual (Canada, Sun Type 6/7)";
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-   name[Group1]="Canada Bilingual";
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [           slash, bar,             backslash                  ]};
    key <AE01> { [               1, exclam,          plusminus                  ]};
@@ -91,7 +71,62 @@ xkb_symbols "type6" {
 
 };
 
-partial alphanumeric_keys
+alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ca(type6)"
+	include "sun_vndr/ca(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ca(fr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-dvorak" {
+	include "ca(fr-dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr-legacy" {
+	include "ca(fr-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi" {
+	include "ca(multi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multi-2gr" {
+	include "ca(multi-2gr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ike" {
+	include "ca(ike)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "multix" {
+	include "ca(multix)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ca(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "eng" {
+	include "ca(eng)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "kut" {
+	include "ca(kut)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "shs" {
+	include "ca(shs)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index 8a41ea303..213b4f08e 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys
+xkb_symbols "sun_type6_de" {
 
-partial default alphanumeric_keys 
-xkb_symbols "de_type6" {
+    name[Group1]= "German (Switzerland, Sun Type 6/7)";
 
-    name[Group1]= "Switzerland - German";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [    section,     degree                           ] };
     key <AE01> { [          1,       plus,          bar             ] };
@@ -86,12 +67,12 @@ xkb_symbols "de_type6" {
 
 };
 
-
-
 partial alphanumeric_keys 
-xkb_symbols "fr_type6" {
+xkb_symbols "sun_type6_fr" {
+
+    name[Group1]= "French (Switzerland, Sun Type 6/7)";
 
-    name[Group1]= "Switzerland - French, Sun type 6";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [    section,     degree                           ] };
     key <AE01> { [          1,       plus,          bar             ] };
@@ -126,8 +107,62 @@ xkb_symbols "fr_type6" {
 
 };
 
-
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ch(de_type6)"
+	include "sun_vndr/ch(sun_type6_de)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ch(legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "de" {
+	include "ch(de)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "de_Sundeadkeys" {
+	include "ch(de_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "de_sundeadkeys" {
+	include "ch(de_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "de_nodeadkeys" {
+	include "ch(de_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr" {
+	include "ch(fr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr_Sundeadkeys" {
+	include "ch(fr_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr_sundeadkeys" {
+	include "ch(fr_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr_nodeadkeys" {
+	include "ch(fr_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "de_mac" {
+	include "ch(de_mac)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fr_mac" {
+	include "ch(fr_mac)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index b46f01c2b..0818c9ab0 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,13 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Czech (Sun Type 6/7";
 
-    name[Group1]="Czech";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>	{ [ semicolon, dead_abovering,	quoteleft,     asciitilde 	]	};
     key <AE01>	{ [      plus,          1,	exclam,     asciitilde	 	]	};
@@ -101,5 +82,30 @@ xkb_symbols "type6" {
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/cz(type6)"
+	include "sun_vndr/cz(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "cz(bksl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "cz(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "cz(qwerty_bksl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ucw" {
+	include "cz(ucw)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak-ucw" {
+	include "cz(dvorak-ucw)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 5177b989a..7736088bb 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
@@ -1,6 +1,5 @@
 //
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -28,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Germany";
+    name[Group1]="German (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [     asciicircum,           degree                   ] };
     key <AE02> { [               2,         quotedbl,     twosuperior  ] }; 
@@ -86,55 +66,106 @@ xkb_symbols "type6" {
 };
 
 partial alphanumeric_keys
-xkb_symbols "type4" {
+	xkb_symbols "basic" {
+	include "sun_vndr/de(sun_type6)"
+};
 
-    name[Group1]="Germany - Sun type 4";
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "de(legacy)"
+};
 
-    key <BKSL>  { [           less,     braceleft     					      ] };
-    key <BRCR>  { [        greater,    braceright     					      ] };
-    key <DELE>  { [         Delete                                                            ] };
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "de(nodeadkeys)"
+};
 
-    key <AE01> { [               1,          plus,               exclam                       ] };
-    key <AE02> { [               2,      quotedbl,                   at,            oneeighth ]	};
-    key <AE03> { [               3,      asterisk,           numbersign,             sterling ]	};
-    key <AE04> { [               4,      ccedilla,                 cent                       ]	};
-    key <AE05> { [               5,       percent,           asciitilde                       ] };
-    key <AE06> { [               6,     ampersand,              section                       ] };
-    key <AE07> { [               7,         slash,                  bar                       ] };
-    key <AE08> { [               8,     parenleft,               degree                       ] };
-    key <AE09> { [               9,    parenright,            backslash                       ] };
-    key <AE10> { [               0,         equal,          asciicircum                       ] };
-    Key <AE11> { [      quoteright,      question,            quoteleft                       ] };
-    key <AE12> { [ dead_circumflex,    dead_grave                                             ] };
+partial alphanumeric_keys
+	xkb_symbols "deadgraveacute" {
+	include "de(deadgraveacute)"
+};
 
-    key <AD03>	{ [              e,             E,             EuroSign,             EuroSign ]	};
-    key <AD06>	{ [              z,             Z,            leftarrow,                  yen ]	};
-    key <AD11>	{ [     udiaeresis,        egrave,       dead_diaeresis,       dead_abovering ] };
-    key <AD12>	{ [ dead_diaeresis,    dead_acute                                             ] };
+partial alphanumeric_keys
+	xkb_symbols "deadacute" {
+	include "de(deadacute)"
+};
 
-    key <AC02>  { [              s,             S                                             ] };
-    key <AC07>  { [              j,             J,        dead_belowdot,        dead_abovedot ] };
-    key <AC10>	{ [     odiaeresis,        eacute,     dead_doubleacute,        dead_belowdot ] };
-    key <AC11>	{ [     adiaeresis,        agrave,      dead_circumflex,           dead_caron ] };
-    key <TLDE>	{ [         dollar,    dead_tilde,             sterling                       ] };
+partial alphanumeric_keys
+	xkb_symbols "ro" {
+	include "de(ro)"
+};
 
-    key <AB01>	{ [              y,             Y,       guillemotright                       ] };
-    key <AB02>	{ [              x,             X,        guillemotleft 	              ] };
-    key <AB04>	{ [              v,             V,   doublelowquotemark,   singlelowquotemark ]	};
-    key <AB05>	{ [              b,             B,  leftdoublequotemark,  leftsinglequotemark ] };
-    key <AB06>	{ [              n,             N, rightdoublequotemark, rightsinglequotemark ]	};    
-    key <AB07>  { [              m,             M,                   mu                       ] };
-    key <AB08>  { [          comma,     semicolon,       periodcentered,             multiply ] };
-    key <AB09>	{ [         period,         colon                                             ] };
-    key <AB10>	{ [          minus,    underscore                                             ] };
+partial alphanumeric_keys
+	xkb_symbols "ro_nodeadkeys" {
+	include "de(ro_nodeadkeys)"
+};
 
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "de(dvorak)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "de(Sundeadkeys)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "de(sundeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/de(type6)"
+	xkb_symbols "neo_base" {
+	include "de(neo_base)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "neo" {
+	include "de(neo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "de(mac)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "de(mac_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dsb" {
+	include "de(dsb)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dsb_qwertz" {
+	include "de(dsb_qwertz)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "de(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ru" {
+	include "de(ru)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "htcdream" {
+	include "de(htcdream)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "de(us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "hu" {
+	include "de(hu)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index e5db30e7f..9975486b8 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Danish (Sun Type 6/7)";
 
-    name[Group1]="Denmark";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [         onehalf,         section                ] };
     key <AE02> { [               2,        quotedbl,            at ] };
@@ -81,67 +62,27 @@ xkb_symbols "type6" {
 
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-   name[Group1]="Denmark - Sun type 4";
-
-   key <BKSL> { [ onehalf,        section                        ] };
-   key <BRCR> { [ asciitilde,     asciicircum                    ] };
-   key <AE02> { [ 2,              quotedbl,       at             ] };
-   key <AE03> { [ 3,              numbersign,     sterling       ] };
-   key <AE04> { [ 4,              currency,       dollar         ] };
-   key <AE06> { [ 6,              ampersand                      ] };
-   key <AE07> { [ 7,              slash,          braceleft      ] };
-   key <AE08> { [ 8,              parenleft,      bracketleft    ] };
-   key <AE09> { [ 9,              parenright,     bracketright   ] };
-   key <AE10> { [ 0,              equal,          braceright     ] };
-   key <AE11> { [ plus,           question                       ] };
-   key <AE12> { [ dead_acute,     dead_grave,     bar            ] };
-   key <AD03> { [ e,              E,              EuroSign       ] };
-   key <AD11> { [ aring,          Aring                          ] };
-   key <AD12> { [ dead_diaeresis, dead_circumflex, dead_tilde    ] };
-   key <LCTL> { [ Caps_Lock                                      ] };
-   key <AC10> { [ ae,             AE                             ] };
-   key <AC11> { [ ooblique,       Ooblique                       ] };
-   key <TLDE> { [ quoteright,     asterisk,       quoteleft      ] };
-   key <LSGT> { [ less,           greater,         backslash     ] };
-   key <AB08> { [ comma,          semicolon                      ] };
-   key <AB09> { [ period,         colon                          ] };
-   key <AB10> { [ minus,          underscore                     ] };
-   key <CAPS> { [ Control_L                                      ] };
-   key <COMP> { [ SunAltGraph                                    ] };
-   key <ALGR> { [ SunCompose                                     ] };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
+	xkb_symbols "basic" {
+	include "sun_vndr/dk(sun_type6)"
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type5" {
-
-   include "sun_vndr/dk(type4)"
-
-    name[Group1]="Denmark - Sun type 5";
-
-    key <AE05> { [ 5,           percent,     asciitilde                 ] };
-    key <AE06> { [ 6,           ampersand,   asciicircum                ] };
-    key <AE07> { [ 7,           slash,       braceleft                  ] };
-    key <AE08> { [ 8,           parenleft,   bracketleft                ] };
-    key <AE09> { [ 9,           parenright,  bracketright               ] };
-    key <AE10> { [ 0,           equal,       braceright                 ] };
-    key <BKSL> { [ quoteright,  asterisk,    quoteleft                  ] };
-    
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	xkb_symbols "nodeadkeys" {
+	include "dk(nodeadkeys)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "dk(mac)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "dk(mac_nodeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/dk(type6)"
+	xkb_symbols "dvorak" {
+	include "dk(dvorak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 0530f9e2f..6f8113317 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Estonia";
+    name[Group1]="Estonian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [     dead_caron,    dead_tilde,	notsign,       notsign ] };
    key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
@@ -113,5 +92,20 @@ xkb_symbols "type6" {
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ee(type6)"
+	include "sun_vndr/ee(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "ee(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "ee(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "ee(us)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 6d28bc541..60557f579 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -26,32 +26,13 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
 
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Spanish (Sun Type 6/7)";
 
-    name[Group1]="Spain";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [       masculine,     ordfeminine,     backslash ] };
     key <LSGT> { [            less,         greater                ] };
@@ -78,68 +59,59 @@ xkb_symbols "type6" {
     key <AB10> { [           minus,      underscore                ] };
    
         include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/es(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "es(Sundeadkeys)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "es(sundeadkeys)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "es(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "es(dvorak)"
+};
 
 partial alphanumeric_keys
-xkb_symbols "type4" {
-    
-    name[Group1]="Spain - Sun type 4";
+	xkb_symbols "cat" {
+	include "es(cat)"
+};
 
-    key <BKSL> { [ bracketleft, braceleft,  guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright,  guillemotright ] };
-    key <AE02> { [ 2, quotedbl,  at                 ] };
-    key <AE03> { [ 3, periodcentered,  numbersign       ] };
-    key <AE05> { [ 5, percent,  degree           ] };
-    key <AE06> { [ 6, ampersand,  notsign          ] };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ]                       };
-    key <AE09> { [ 9, parenright, backslash        ] };
-    key <AE10> { [ 0, equal,  bar              ] };
-    key <AE11> { [ quoteright, question,  quoteleft        ] };
-    key <AE12> { [ exclamdown, questiondown ] };
-    key <AD03> { [ e, E,  EuroSign         ] };
-    key <AD09> { [ o, O,  masculine        ] };
-    key <AD11> { [ dead_grave, dead_circumflex,  asciicircum ] };
-    key <AD12> { [ plus, asterisk,  asciitilde       ] };
-    key <AC01> { [ a, A,  ordfeminine      ] };
-    key <AC10> { [ ntilde, Ntilde               ]                       };
-    key <AC11> { [ dead_acute, dead_diaeresis ]                       };
-    key <TLDE> { [ ccedilla, Ccedilla             ]                       };
-    key <RALT> { [ Alt_R                ]                       };
-    key <LCTL> { [ Caps_Lock ] };
-    key <CAPS> { [ Control_L ] };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    
+partial alphanumeric_keys
+	xkb_symbols "ast" {
+	include "es(ast)"
 };
- 
 
 partial alphanumeric_keys
-xkb_symbols "type5" {
-    include "sun_vndr/es(type4)"
+	xkb_symbols "mac" {
+	include "es(mac)"
+};
 
-    name[Group1]="Spain - Sun type 5";
- 
-    key <AE03> { [ 3, periodcentered,  numbersign                 ] };
-    key <AE04> { [ 4, dollar,  asciicircum                ] };
-    key <AE05> { [ 5, percent,  asciitilde                 ] };
-    key <AE07> { [ 7, slash,  braceleft                  ]};
-    key <AE08> { [ 8, parenleft,  bracketleft                ]};
-    key <AE09> { [ 9, parenright,  bracketright               ]};
-    key <AE10> { [ 0, equal,  braceright                 ]};
-    key <AE11> { [ quoteright, question,  quoteleft                  ] };
-    key <AD11> { [ dead_grave, dead_circumflex,  bracketleft ] };
-    key <AD12> { [ dead_acute, dead_diaeresis, braceleft      ] };
- 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "es(olpc)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "deadtilde" {
+	include "es(deadtilde)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/es(type6)"
+	xkb_symbols "olpc2" {
+	include "es(olpc2)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index eaa19e848..13e822c8f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -26,32 +26,13 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
- 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
 
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Finnish (Sun Type 6/7)";
 
-    name[Group1]="Finland";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [  section,         onehalf                                  ] };
     key <AE01> { [  1,               exclam                                   ] };
@@ -79,11 +60,39 @@ xkb_symbols "type6" {
 
 	include "level3(ralt_switch)"
 	include "kpdl(comma)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fi(sun_type6)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "kotoistus" {
+	include "fi(kotoistus)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/fi(type6)"
+	xkb_symbols "classic" {
+	include "fi(classic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fi" {
+	include "fi(fi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fi(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "fi(smi)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fi(mac)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index a3850ba5f..f046c3f85 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="France";
+    name[Group1]="French (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [     twosuperior                              ] };
     key <AE01>	{ [       ampersand,          1                  ] };
@@ -86,11 +67,109 @@ xkb_symbols "type6" {
     key <AB10>	{ [          exclam,    section                  ] };
 
 	include "level3(ralt_switch)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/fr(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "fr(olpc)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "fr(Sundeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/fr(type6)"
+	xkb_symbols "sundeadkeys" {
+	include "fr(sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "fr(nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss" {
+	include "fr(oss)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_latin9" {
+	include "fr(oss_latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_Sundeadkeys" {
+	include "fr(oss_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_sundeadkeys" {
+	include "fr(oss_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oss_nodeadkeys" {
+	include "fr(oss_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9" {
+	include "fr(latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_Sundeadkeys" {
+	include "fr(latin9_Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_sundeadkeys" {
+	include "fr(latin9_sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "latin9_nodeadkeys" {
+	include "fr(latin9_nodeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bepo" {
+	include "fr(bepo)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bepo_latin9" {
+	include "fr(bepo_latin9)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "fr(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bre" {
+	include "fr(bre)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "oci" {
+	include "fr(oci)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "fr(mac)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "fr(geo)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index 78287ec06..f329c5fd5 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="English (UK, Sun Type 6/7)";
 
-    name[Group1]="United Kingdom";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [  quoteleft,    notsign,  brokenbar ] };
 
@@ -63,40 +44,44 @@ xkb_symbols "type6" {
     key <LSGT> { [  backslash,        bar             ] };
 
 	include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type5" {
-
-    name[Group1]="United Kingdom - Sun type 5";
-
-    key <TLDE> {        [       quoteleft,      notsign,    brokenbar         ] };
-    key <AD03> {        [               e,      E,          EuroSign          ] };
-
-	include "level3(ralt_switch)"
-
+	xkb_symbols "basic" {
+	include "sun_vndr/gb(sun_type6)"
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
+	xkb_symbols "intl" {
+	include "gb(intl)"
+};
 
-    name[Group1]="United Kingdom - Sun type 4";
+partial alphanumeric_keys
+	xkb_symbols "extd" {
+	include "gb(extd)"
+};
 
-    key <AE01> { [      1,     exclam,   brokenbar ] };
-    key <AE03> { [      3,   sterling,  numbersign ] };
-    key <AE04> { [      4,     dollar,    EuroSign ] };
-    key <AE11> { [  minus, underscore,     notsign ] };
-    key <AD03> { [      e,          E,    EuroSign ] };
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "gb(colemak)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "gb(dvorak)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "dvorakukp" {
+	include "gb(dvorakukp)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "gb(mac)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/gb(type6)"
+	xkb_symbols "mac_intl" {
+	include "gb(mac_intl)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index 1f3fac799..218e95051 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
+    name[Group1]="Greek (Sun Type 6/7)";
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Greece";
-
+	include "sun_vndr/us(sun_type6)"
 
 	key <TLDE> { [                 grave,     asciitilde,	onehalf ] };
 	key <AE01> { [                     1,         exclam ] };
@@ -96,22 +75,46 @@ xkb_symbols "type6" {
 	key <BKSL> { [             backslash,            bar,	brokenbar ] };
 
 	key <LSGT> { [         guillemotleft, guillemotright,	brokenbar ] };
-        key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
-        key <AB02> { [             Greek_chi,      Greek_CHI ] };
-        key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
-        key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
-        key <AB05> { [            Greek_beta,     Greek_BETA ] };
-        key <AB06> { [              Greek_nu,       Greek_NU ] };
-        key <AB07> { [              Greek_mu,       Greek_MU ] };
+	key <AB01> { [            Greek_zeta,     Greek_ZETA ] };
+	key <AB02> { [             Greek_chi,      Greek_CHI ] };
+	key <AB03> { [             Greek_psi,      Greek_PSI,	copyright ] };
+	key <AB04> { [           Greek_omega,    Greek_OMEGA ] };
+	key <AB05> { [            Greek_beta,     Greek_BETA ] };
+	key <AB06> { [              Greek_nu,       Greek_NU ] };
+	key <AB07> { [              Greek_mu,       Greek_MU ] };
 	key <AB08> { [                 comma,           less,	guillemotleft ] };
 	key <AB09> { [                period,        greater,	guillemotright ] };
 	key <AB10> { [                 slash,       question ] };
 
 	include "level3(ralt_switch)"
+};
 
+alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/gr(sun_type6)"
 };
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/gr(type6)"
+	xkb_symbols "simple" {
+	include "gr(simple)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bare" {
+	include "gr(bare)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "extended" {
+	include "gr(extended)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "polytonic" {
+	include "gr(polytonic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "gr(nodeadkeys)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index acd94a2fb..d73ef6e64 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]= "Italian (Sun Type 6/7)";
 
-    name[Group1]="Italy";
+	include "sun_vndr/us(sun_type6)"
 
     key <LSGT> { [            less,         greater                                ] };
     key <TLDE> { [       backslash,             bar                                ] };
@@ -75,66 +56,44 @@ xkb_symbols "type6" {
     key <AB10> { [           minus,      underscore                                ] };
 
         include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Italy - Sun type 4";
- 
-    key <BKSL> { [ bracketleft,  braceleft,    guillemotleft    ] };
-    key <BRCR> { [ bracketright, braceright,   guillemotright   ] };
-    key <AE02> { [ 2,            quotedbl,     twosuperior      ] };
-    key <AE03> { [ 3,            sterling,     threesuperior    ] };
-    key <AE06> { [ 6,            ampersand,    notsign          ] };
-    key <AE06> { [ 7,            slash                          ] };
-    key <AE06> { [ 8,            parenleft                      ] };
-    key <AE09> { [ 9,            parenright,   backslash        ] };
-    key <AE10> { [ 0,            equal,        bar              ] };
-    key <AE11> { [ quoteright,   question,     quoteleft        ] };
-    key <AE12> { [ igrave,       asciicircum                    ] };
- 
-    key <AD11> { [ egrave,       eacute                         ] };
-    key <AD12> { [ plus,         asterisk,     asciitilde       ] };
- 
-    key <AC10> { [ ograve,       ccedilla,     at               ] };
-    key <AC11> { [ agrave,       degree,       numbersign       ] };
-    key <TLDE> { [ ugrave,       section                        ] };
- 
-    key <LSGT> { [ less, greater        ] };
-    key <AB08> { [ comma, semicolon     ] };
-    key <AB09> { [ period, colon        ] };
-    key <AB10> { [ minus, underscore    ] };
-     
- 
-    key <LALT> { [ Alt_L                ] };
-    key <COMP> { [ SunCompose           ] };
-    key <RALT> { [ SunAltGraph          ] };
-    key <LCTL> { [ Caps_Lock            ] };
-    key <CAPS> { [ Control_L            ] };
- 
-	include "level3(ralt_switch)"
+	xkb_symbols "basic" {
+	include "sun_vndr/it(sun_type6)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "it(nodeadkeys)"
 };
 
- 
 partial alphanumeric_keys
-xkb_symbols "type5" {
+	xkb_symbols "mac" {
+	include "it(mac)"
+};
 
-    name[Group1]="Italy - Sun type 5";
+partial alphanumeric_keys
+	xkb_symbols "geo" {
+	include "it(geo)"
+};
 
-    key <AE08> { [ 8,      parenleft,   braceleft                  ] };
-    key <AE09> { [ 9,      parenright,  braceright                 ] };
-    key <BKSL> { [ ugrave, section,     asciitilde                 ] };
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "it(olpc)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "it(us)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "htcdream" {
+	include "it(htcdream)"
 };
- 
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/it(type6)"
+	xkb_symbols "ibm" {
+	include "it(ibm)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index 26911494a..c30d31e38 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -26,791 +26,154 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys modifier_keys
+xkb_symbols "sun_type6_suncompat" {
 
-xkb_symbols "basic" {
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-    key <EXEC> { [ Execute		]			};
-};
-xkb_symbols "type4" {
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    key <COMP> { [ Multi_key		]			};
-    key <EXEC> { [ Execute		]			};
-//    key <TLFD> { [ Linefeed		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-    key <BRCR> { [ Linefeed		]			};
-
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2   	{ Mode_switch };
-    modifier_map Mod3   	{ Num_Lock };
-    modifier_map Mod4		{ Alt_L };
-};
+	include "inet(evdev)"
+	include "sun_vndr/us(sunbasic)"
 
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
+    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
+    key <AE01> { [ 1, exclam       ], [ kana_NU        ]   };
+    key <AE02> { [ 2, quotedbl     ], [ kana_FU        ]   };
+    key <AE03> { [ 3, numbersign   ], [ kana_A, kana_a ]   };
+    key <AE04> { [ 4, dollar       ], [ kana_U, kana_u ]   };
+    key <AE05> { [ 5, percent      ], [ kana_E, kana_e ]   };
+    key <AE06> { [ 6, ampersand        ], [ kana_O, kana_o ]   };
+    key <AE07> { [ 7, apostrophe   ], [ kana_YA, kana_ya   ]   };
+    key <AE08> { [ 8, parenleft        ], [ kana_YU, kana_yu   ]   };
+    key <AE09> { [ 9, parenright   ], [ kana_YO, kana_yo   ]   };
+    key <AE10> { [ 0           ], [ kana_WA, kana_WO   ]   };
+    key <AE11> { [ minus, equal        ], [ kana_HO        ]   };
+    key <AE12> { [ asciicircum,    asciitilde], [ kana_HE      ]   };
+
+    key <AD01> { [ q, Q            ], [ kana_TA        ]   };
+    key <AD02> { [ w, W            ], [ kana_TE        ]   };
+    key <AD03> { [ e, E            ], [ kana_I, kana_i ]   };
+    key <AD04> { [ r, R            ], [ kana_SU        ]   };
+    key <AD05> { [ t, T            ], [ kana_KA        ]   };
+    key <AD06> { [ y, Y            ], [ kana_N     ]   };
+    key <AD07> { [ u, U            ], [ kana_NA        ]   };
+    key <AD08> { [ i, I            ], [ kana_NI        ]   };
+    key <AD09> { [ o, O            ], [ kana_RA        ]   };
+    key <AD10> { [ p, P            ], [ kana_SE        ]   };
+    key <AD11> { [ at, quoteleft   ], [ voicedsound    ]   };
+    key <AD12> { [ bracketleft,    braceleft ], [ semivoicedsound, kana_openingbracket ] };
+
+    key <AC01> { [ a, A            ], [ kana_CHI       ]   };
+    key <AC02> { [ s, S            ], [ kana_TO        ]   };
+    key <AC03> { [ d, D            ], [ kana_SHI       ]   };
+    key <AC04> { [ f, F            ], [ kana_HA        ]   };
+    key <AC05> { [ g, G            ], [ kana_KI        ]   };
+    key <AC06> { [ h, H            ], [ kana_KU        ]   };
+    key <AC07> { [ j, J            ], [ kana_MA        ]   };
+    key <AC08> { [ k, K            ], [ kana_NO        ]   };
+    key <AC09> { [ l, L            ], [ kana_RI        ]   };
+    key <AC10> { [ semicolon, plus ], [ kana_RE        ]   };
+    key <AC11> { [ colon, asterisk ], [ kana_KE        ]   };
     key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
 
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-//    key <RCTL> { [ Control_R		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
+    key <AB01> { [ z, Z            ], [ kana_TSU, kana_tsu ]   };
+    key <AB02> { [ x, X            ], [ kana_SA        ]   };
+    key <AB03> { [ c, C            ], [ kana_SO        ]   };
+    key <AB04> { [ v, V            ], [ kana_HI        ]   };
+    key <AB05> { [ b, B            ], [ kana_KO        ]   };
+    key <AB06> { [ n, N            ], [ kana_MI        ]   };
+    key <AB07> { [ m, M            ], [ kana_MO        ]   };
+    key <AB08> { [ comma, less     ], [ kana_NE, kana_comma ]  };
+    key <AB09> { [ period, greater ], [ kana_RU, kana_fullstop ]   };
+    key <AB10> { [ slash, question ], [ kana_ME, kana_conjunctive ]};
+    key <AB11> { [ backslash, underscore], [ kana_RO       ]   };
+    key <UNDR> { [ backslash, underscore], [ kana_RO       ]   };
+
+    key <EXEC> { [ Execute		            ]	};
+    key <KANJ> { [ Kanji		            ]	};
+    key <HENK> { [ Henkan_Mode		        ]	};
+    key <ALGR> { [ Kana_Lock, Mode_switch   ]	};
+
+	key <COMP> { [ Multi_key				]	};
+	key <SYRQ> { [ SunSys_Req				]	};
+
+	modifier_map Mod3 { Kana_Lock };
+
 };
 
-xkb_symbols "type5hobo" {
-
-    // Alphanumeric section
-    key <TLDE> { [ backslash, bar	], [ prolongedsound	]	};
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	], [ KP_7 ]};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	], [ KP_8 ]};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	], [ KP_9 ]};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	], [ KP_Multiply]};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U		], [ kana_NA		], [ KP_4 ]	};
-    key <AD08> { [ i, I		], [ kana_NI		], [ KP_5 ]	};
-    key <AD09> { [ o, O		], [ kana_RA		], [ KP_6 ]	};
-    key <AD10> { [ p, P		], [ kana_SE		], [ KP_Subtract]};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return	], [ NoSymbol, NoSymbol], [ KP_Enter	] };
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J		], [ kana_MA		], [ KP_1 ]};
-    key <AC08> { [ k, K		], [ kana_NO		], [ KP_2 ]};
-    key <AC09> { [ l, L		], [ kana_RI		], [ KP_3 ]};
-    key <AC10> { [ semicolon, plus], [ kana_RE		], [ KP_Add ]};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+partial alphanumeric_keys
+xkb_symbols "sun_type6" {
+
+    // include "jp"
+    // type6 based on "jp" should be provided later
+
+    include "sun_vndr/jp(sun_type6_suncompat)"
 
-    key <LFSH> { [ Shift_L		]	};
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		], [ KP_0 ]};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ], [ KP_Decimal ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ], [ KP_Divide ]};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-    key <RTSH> { [ Shift_R		]	};
-
-    key <LCTL> { [ Control_L		]			};
-    key <EXEC> { [ Execute		]			};
-    key <SPCE> { [ space		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-     key <NMLK> { [ Num_Lock 		]				};
-//     key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-//     key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-//     key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-//     key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-//     key  <KP8> { [ Up, R8		], [ KP_8		]	};
-//     key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-//     key <KPAD> { [ KP_Add		]				};
-
-//     key  <KP4> { [ Left, R10		], [ KP_4		]	};
-//     key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-//     key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-//     key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-//     key  <KP2> { [ Down, R14		], [ KP_2		]	};
-//     key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-//     key <KPEN> { [ KP_Enter		]				};
-
-//     key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-//     key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2	{ Alt_R };
-    modifier_map Mod3	{ Num_Lock };
-    modifier_map Mod4	{ Alt_L };
 };
 
-// layout for a Japanese Type 6 Sun keyboard
-// Just shows differences from Type 6 US layout 
-partial
-xkb_symbols "type6" {
+partial alphanumeric_keys
+xkb_symbols "sun_type7_suncompat" {
 
-    // Alphanumeric section
-    // Though Yen symbol is engraved on key AE13, JA L10N folks want backslash.
-    key <AE13> { [ backslash, bar       ], [ prolongedsound     ]       };
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <BKSL> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
+    include "sun_vndr/jp(sun_type6_suncompat)"
+
+    key <AE10> { [ 0, asciitilde, kana_WA, kana_WO      ]   };
+    key <TLDE> { [ Henkan_Mode                          ]   };
+    key <HENK> { [ Kana_Lock, Mode_switch               ]   };
+    key <ALGR> { [ Alt_R, Alt_R                         ]   };
 
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-    key <AB11> { [ backslash, underscore], [ kana_RO		]	};
-    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <EXEC> { [ Execute		]			};
-    key <KANJ> { [ Kanji		]			};
-    key <HENK> { [ Henkan_Mode		]			};
-    key <ALGR> { [ Kana_Lock, Mode_switch ]	};
-    // End alphanumeric section
 };
 
-xkb_symbols "x86" {
-    include "sun_vndr/us(pc101)"
-    include "sun_vndr/jp(basic)"
-    key <TLDE> { [ Henkan_Mode, Henkan_Mode ], [ Henkan_Mode ] };
+partial alphanumeric_keys
+xkb_symbols "suncompat" {
 
-    key <AE10> { [ 0, asciitilde	    ], [ kana_WA, kana_WO	]};
-    key <AE13> { [ backslash, bar	    ], [ prolongedsound		]};
+    include "sun_vndr/jp(sun_type7_suncompat)"
+};
 
-    
-    key <AC12> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket	]};
+partial alphanumeric_keys
+xkb_symbols "sun_type7" {
 
-    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Alt_R ]	       };
+    include "jp"
 
 };
 
-xkb_symbols "J3100" {
-    include "sun_vndr/us(pc101)"
-
-    // Alphanumeric section
-    key <AE01> { [ 1, exclam 		], [ kana_NU		]	};
-    key <AE02> { [ 2, quotedbl		], [ kana_FU		]	};
-    key <AE03> { [ 3, numbersign	], [ kana_A, kana_a	]	};
-    key <AE04> { [ 4, dollar		], [ kana_U, kana_u	]	};
-    key <AE05> { [ 5, percent		], [ kana_E, kana_e	]	};
-    key <AE06> { [ 6, ampersand		], [ kana_O, kana_o	]	};
-    key <AE07> { [ 7, apostrophe	], [ kana_YA, kana_ya	]	};
-    key <AE08> { [ 8, parenleft		], [ kana_YU, kana_yu	]	};
-    key <AE09> { [ 9, parenright	], [ kana_YO, kana_yo	]	};
-    key <AE10> { [ 0			], [ kana_WA, kana_WO	]	};
-    key <AE11> { [ minus, equal		], [ kana_HO		]	};
-    key <AE12> { [ asciicircum,	asciitilde], [ kana_HE		]	};
-    key <BKSP> { [ BackSpace		]	};
-
-    key  <TAB> { [ Tab,	ISO_Left_Tab	]	};
-    key <AD01> { [ q, Q 		], [ kana_TA		]	};
-    key <AD02> { [ w, W			], [ kana_TE		]	};
-    key <AD03> { [ e, E			], [ kana_I, kana_i	]	};
-    key <AD04> { [ r, R			], [ kana_SU		]	};
-    key <AD05> { [ t, T			], [ kana_KA		]	};
-    key <AD06> { [ y, Y			], [ kana_N		]	};
-    key <AD07> { [ u, U			], [ kana_NA		]	};
-    key <AD08> { [ i, I			], [ kana_NI		]	};
-    key <AD09> { [ o, O			], [ kana_RA		]	};
-    key <AD10> { [ p, P			], [ kana_SE		]	};
-    key <AD11> { [ at, quoteleft	], [ voicedsound	]	};
-    key <AD12> { [ bracketleft,	braceleft ], [ semivoicedsound, kana_openingbracket ] };
-    key <RTRN> { [ Return		]	};
-
-    key <CAPS> { [ Caps_Lock		]	};
-    key <AC01> { [ a, A 		], [ kana_CHI		]	};
-    key <AC02> { [ s, S			], [ kana_TO		]	};
-    key <AC03> { [ d, D			], [ kana_SHI		]	};
-    key <AC04> { [ f, F			], [ kana_HA		]	};
-    key <AC05> { [ g, G			], [ kana_KI		]	};
-    key <AC06> { [ h, H			], [ kana_KU		]	};
-    key <AC07> { [ j, J			], [ kana_MA		]	};
-    key <AC08> { [ k, K			], [ kana_NO		]	};
-    key <AC09> { [ l, L			], [ kana_RI		]	};
-    key <AC10> { [ semicolon, plus	], [ kana_RE		]	};
-    key <AC11> { [ colon, asterisk	], [ kana_KE		]	};
-    key <TLDE> { [ bracketright, braceright ], [ kana_MU, kana_closingbracket ] };
-
-    key <AB01> { [ z, Z 		], [ kana_TSU, kana_tsu	]	};
-    key <AB02> { [ x, X			], [ kana_SA		]	};
-    key <AB03> { [ c, C			], [ kana_SO		]	};
-    key <AB04> { [ v, V			], [ kana_HI		]	};
-    key <AB05> { [ b, B			], [ kana_KO		]	};
-    key <AB06> { [ n, N			], [ kana_MI		]	};
-    key <AB07> { [ m, M			], [ kana_MO		]	};
-    key <AB08> { [ comma, less		], [ kana_NE, kana_comma ]	};
-    key <AB09> { [ period, greater	], [ kana_RU, kana_fullstop ]	};
-    key <AB10> { [ slash, question	], [ kana_ME, kana_conjunctive ]};
-//    key <UNDR> { [ backslash, underscore], [ kana_RO		]	};
-
-    key <SPCE> { [ space		]			};
-//    key <KANJ> { [ Kanji		]			};
-//    key <HENK> { [ Henkan_Mode		]			};
-//    key <LNFD> { [ backslash, underscore], [ kana_RO		]};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <ESC>  { [ Escape		]			};
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <BKSL> { [ backslash, bar	], [ prolongedsound 	] };
-//    key <BRCR> { [ Linefeed		]			};
-//    key <EXEC> { [ Execute		]			};
-
-    key <ESC>  { [ Escape, 3 ] };
-
-    key <AE02> { [ 2, at		], [ kana_FU			]};
-    key <AE06> { [ 6, asciicircum	], [ kana_O, kana_o		]};
-    key <AE07> { [ 7, ampersand		], [ kana_YA, kana_ya		]};
-    key <AE08> { [ 8, asterisk		], [ kana_YU, kana_yu		]};
-    key <AE09> { [ 9, parenleft		], [ kana_YO, kana_yo		]};
-    key <AE10> { [ 0, parenright	], [ kana_WA, kana_WO		]};
-    key <AE11> { [ minus, underscore	], [ kana_HO			]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <BKSL> { [ backslash, bar	    ], [ prolongedsound		]};
-    key <AE12> { [ equal, plus		], [ kana_HE			]};
-
-    key <AD11> { [ bracketleft, braceleft  ], [ voicedsound		]};    
-    key <AD12> { [ bracketright, braceright  ], [ semivoicedsound, kana_openingbracket	]};    
-
-    key <AC10> { [ semicolon, colon	     ], [ kana_RE		]};    
-    key <AC11> { [ quoteright, quotedbl	     ], [ kana_KE		]};    
-
-    key <TLDE> { [ quoteleft, asciitilde ], [ kana_MU, kana_closingbracket	]};
-    key <LSGT> { [ backslash, bar	 ], [ kana_RO			]};
-//    key <ALGR> { [ Mode_switch ]	       };
-    key <RALT> { [ Henkan_Mode ]	       };
-    key <RCTL> { [ Mode_switch ]	       };
+partial alphanumeric_keys
+	xkb_symbols "106" {
+	include "jp(106)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "common" {
+	include "jp(common)"
 };
 
-xkb_symbols "Muhenkan_x86" {
-    include "sun_vndr/jp(x86)"
+partial alphanumeric_keys
+	xkb_symbols "OADG109A" {
+	include "jp(OADG109A)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "kana86" {
+	include "jp(kana86)"
+};
 
-    key <EXEC> { [ Muhenkan ] };
+partial alphanumeric_keys
+	xkb_symbols "kana" {
+	include "jp(kana)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "nicola_f_bs" {
+	include "jp(nicola_f_bs)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "jp(mac)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "hztg_escape" {
+	include "jp(hztg_escape)"
+};
 
-partial
-xkb_symbols "type7" {
-    include "sun_vndr/jp(type6)"
-    key <AE10> { [ 0, asciitilde       ], [ kana_WA, kana_WO   ]       };
-    key <TLDE> { [ Henkan_Mode ] };
-    key <HENK> { [ Kana_Lock, Mode_switch ] };
-    key <ALGR> { [ Alt_R, Alt_R ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "jp(dvorak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 62cf63d71..cc6d29e9a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -26,72 +26,44 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
-//
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-// Korean layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
+	name[Group1]= "Korean (Sun Type 6/7)";
 
-    // A few keys are different
-    key <ALGR> { [ Hangul                       ]       };
-    key <COMP> { [ Hangul_Hanja                 ]       };
-    key <KANA> { [ Hangul                       ]       };
-    key <EISU> { [ Hangul_Hanja                 ]       };
-    key <BKSL> { [ backslash, bar,  brokenbar   ]       };
+	include "sun_vndr/us(sunbasic)"
 
-        include "level3(ralt_switch)"
+    // A few keys are different
+    key <ALGR> { [ Hangul                       ] };
+    key <COMP> { [ Hangul_Hanja                 ] };
+    key <KANA> { [ Hangul                       ] };
+    key <EISU> { [ Hangul_Hanja                 ] };
+    key <BKSL> { [ backslash, bar,  brokenbar   ] };
 
 };
 
-
-// Korean layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-    key <LNFD> { [ Hangul		]			};
-    key <RALT> { [ Linefeed		]			};
-    key <COMP> { [ Hangul_Hanja		]			};
-
-	include "level3(ralt_switch)"
-
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/kr(sun_type6)"
 };
 
-// Korean layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
-
-    // A few keys are different
-    key <ALGR> { [ Hangul		]				  };
-    key <COMP> { [ Hangul_Hanja		]				  };
-    key <BKSL> { [ backslash, bar,  brokenbar			] };
-
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "kr106" {
+	include "kr(kr106)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "kr104" {
+	include "kr(kr104)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "koreankeys" {
+	include "kr(koreankeys)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/kr(type6)"
+partial alphanumeric_keys
+	xkb_symbols "koreankeys_raltctl" {
+	include "kr(koreankeys_raltctl)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index 8e8bee0f8..b333622d9 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,34 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Lithuania";
+xkb_symbols "sun_type6" {
 
+    name[Group1]="Lithuanian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [ quoteleft,   asciitilde,	notsign,   brokenbar ]    };
     key <AE01>  { [   aogonek,      Aogonek,	1,      exclam ]    };
@@ -109,10 +87,39 @@ xkb_symbols "type6" {
     key <AB10>  { [     slash,   question,	dead_belowdot, dead_abovedot ] };
 
 	include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/lt(type6)"
+	include "sun_vndr/lt(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us" {
+	include "lt(us)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "lt(std)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ibm" {
+	include "lt(ibm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "lekp" {
+	include "lt(lekp)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "lekpa" {
+	include "lt(lekpa)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "us_dvorak" {
+	include "lt(us_dvorak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index befcfc679..998145e65 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
+default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial default alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Latvia";
+    name[Group1]="Latvian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [          grave,    asciitilde,	acute,    asciitilde ] };
    key <AE01> { [              1,        exclam,	onesuperior,    exclamdown ] };
@@ -108,10 +87,79 @@ xkb_symbols "type6" {
    key <AB10> { [          slash,      question,	slash,      abovedot ] };
 
 	include "level3(ralt_switch)"
+};
 
+alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/lv(sun_type6)"
 };
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/lv(type6)"
+	xkb_symbols "apostrophe" {
+	include "lv(apostrophe)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "tilde" {
+	include "lv(tilde)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "fkey" {
+	include "lv(fkey)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "adapted" {
+	include "lv(adapted)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ergonomic" {
+	include "lv(ergonomic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "modern" {
+	include "lv(modern)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "lv(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ykeydvorak" {
+	include "lv(ykeydvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "minuskeydvorak" {
+	include "lv(minuskeydvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorakprogr" {
+	include "lv(dvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ykeydvorakprogr" {
+	include "lv(ykeydvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "minuskeydvorakprogr" {
+	include "lv(minuskeydvorakprogr)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "lv(colemak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "apostrophecolemak" {
+	include "lv(apostrophecolemak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 3e0ba2011..8f7a69de0 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
 default partial alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
+
+    name[Group1]="Dutch (Sun Type 6/7)";
 
-    name[Group1]="Netherlands";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [        at,    section,      notsign ] };
     key <AE01>  { [         1,     exclam,  onesuperior ] };
@@ -95,54 +76,29 @@ xkb_symbols "type6" {
     key <AB10>  { [     minus,      equal ] };
 
         include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-    name[Group1]="Netherlands - Sun type 4";
-
-    key <BKSL> { [ at, section, notsign ]           };
-    key <BRCR> { [ backslash, bar       ]                       };
-    key <AE01> { [ 1, exclam, onesuperior ]       };
-    key <AE02> { [ 2, quotedbl, twosuperior ]       };
-    key <AE03> { [ 3, numbersign, threesuperior]      };
-    key <AE04> { [ 4, dollar, onequarter  ]       };
-    key <AE05> { [ 5, percent, onehalf     ]       };
-    key <AE06> { [ 6, ampersand, threequarters]      };
-    key <AE07> { [ 7, underscore, sterling    ]       };
-    key <AE08> { [ 8, parenleft, braceleft   ]       };
-    key <AE09> { [ 9, parenright, braceright  ]       };
-    key <AE10> { [ 0, quoteright, quoteleft   ]       };
-    key <AE11> { [ slash, question, backslash  ]        };
-    key <AE12> { [ degree, dead_tilde, dead_cedilla]      };
-    key <AD03> { [ e, E, EuroSign, Eacute    ]};
-    key <AD11> { [ dead_diaeresis, dead_circumflex, asciitilde, asciicircum]};
-    key <AD12> { [ asterisk, bar, asciitilde  ]       };
-    key <AC02> { [ S, S, ssharp      ]               };
-    key <AC10> { [ plus, plusminus      ]                       };
-    key <AC11> { [ dead_acute, dead_grave ]                    };
-    key <TLDE> { [ less, greater, asciicircum ]       };
-    key <LSGT> { [ bracketleft, bracketright, brokenbar ]     };
-    key <AB01> { [ z, Z, guillemotleft]      };
-    key <AB02> { [ x, X, guillemotright]     };
-    key <AB03> { [ c, C, cent        ]       };
-    key <AB07> { [ m, M, Greek_mu, masculine ]       };
-    key <AB08> { [ comma, semicolon, cedilla, guillemotleft]     };
-    key <AB09> { [ period, colon, periodcentered, guillemotright ] };
-    key <AB10> { [ minus, equal, hyphen ]            };
-    key <CAPS> { [ SunAltGraph          ]                       };
-//    key <COMP> { [ SunCompose         ]                       };
-    key <ALGR> { [ Caps_Lock            ]                       }; 
+	xkb_symbols "basic" {
+	include "sun_vndr/nl(sun_type6)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "nl(std)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "nl(Sundeadkeys)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "nl(sundeadkeys)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/nl(type6)"
+	xkb_symbols "mac" {
+	include "nl(mac)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index bcc8c30cc..1dde45f6f 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial alphanumeric_keys
-xkb_symbols "type6" {
+    name[Group1]="Norwegian (Sun Type 6/7)";
 
-    name[Group1]="Norway";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [             bar,         section                ] };
     key <LSGT> { [            less,         greater                ] };
@@ -78,67 +59,44 @@ xkb_symbols "type6" {
 
         include "level3(ralt_switch)"
         include "kpdl(comma)"
-
 };
 
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-     name[Group1]="Norway - Sun type 4";
-
-    key <BKSL> { [ bar, section         ]                       };
-    key <BRCR> { [ asciitilde, asciicircum]                     };
-    key <AE02> { [ 2, quotedbl, at          ]       };
-    key <AE03> { [ 3, numbersign, sterling    ]       };
-    key <AE04> { [ 4, currency, dollar      ]       };
-    key <AE06> { [ 6, ampersand         ]                       };
-    key <AE07> { [ 7, slash, braceleft   ]       };
-    key <AE08> { [ 8, parenleft, bracketleft ]       };
-    key <AE09> { [ 9, parenright, bracketright]       };
-    key <AE10> { [ 0, equal, braceright  ]       };
-    key <AE11> { [ plus, question       ]                       };
-    key <AE12> { [ backslash, dead_grave,  dead_acute ]       };
-    key <AD03> { [ e, E, EuroSign    ]       };
-    key <AD11> { [ aring, Aring                ]                       };
-    key <AD12> { [ dead_diaeresis, dead_circumflex,  dead_tilde ] };
-    key <LCTL> { [ Caps_Lock            ]                       };
-    key <AC10> { [ Ooblique             ]                       };
-    key <AC11> { [ ae, AE                   ]                       };
-    key <TLDE> { [ quoteright, asterisk, quoteleft   ]       };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <CAPS> { [ Control_L            ]                       };
-
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
-
+	xkb_symbols "basic" {
+	include "sun_vndr/no(sun_type6)"
 };
 
-
 partial alphanumeric_keys
-xkb_symbols "type5" {
-    
-    name[Group1]="Norway - Sun type 5";
+	xkb_symbols "nodeadkeys" {
+	include "no(nodeadkeys)"
+};
 
-    key <AE05> { [ 5, percent, asciitilde               ] };
-    key <AE06> { [ 6, ampersand, asciicircum            ] };
-    key <AE07> { [ 7, slash,  braceleft                 ] };
-    key <AE08> { [ 8, parenleft,  bracketright          ] };
-    key <AE09> { [ 9, parenright,  bracketright         ] };
-    key <AE10> { [ 0, equal,  braceright                ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "no(dvorak)"
+};
 
-    key <BKSL> { [ quoteright, asterisk,  quoteleft     ] };
-    key <LSGT> { [ less, greater                        ] };
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "no(smi)"
+};
 
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+partial alphanumeric_keys
+	xkb_symbols "smi_nodeadkeys" {
+	include "no(smi_nodeadkeys)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "no(mac)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "no(mac_nodeadkeys)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/no(type6)"
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "no(colemak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
index 2fdf1fe06..d5a7f5b04 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Polish Developers";
+    name[Group1]="Polish (Sun Type 6/7)";
+
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [ grave, 	 asciitilde					] };
     key <AE01> { [ 1,		 exclam						] };
@@ -91,11 +71,59 @@ xkb_symbols "type6" {
     key <AB10> { [ slash,	 question					] };
 
 	include "level3(ralt_switch)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/pl(sun_type6)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "pl(legacy)"
+};
 
 partial alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/pl(type6)"
+	xkb_symbols "qwertz" {
+	include "pl(qwertz)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "pl(intl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "pl(dvorak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_quotes" {
+	include "pl(dvorak_quotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvorak_altquotes" {
+	include "pl(dvorak_altquotes)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dvp" {
+	include "pl(dvp)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "szl" {
+	include "pl(szl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "csb" {
+	include "pl(csb)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ru_phonetic_dvorak" {
+	include "pl(ru_phonetic_dvorak)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index 9e0ec9502..b6797bb94 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial alphanumeric_keys
-xkb_symbols "type6" {
+    name[Group1]= "Portuguese (Sun Type 6/7)";
 
-    name[Group1]="Portugal";
+	include "sun_vndr/us(sun_type6)"
 
     key <LSGT> { [            less,          greater                  ] };
     key <TLDE> { [       backslash,              bar                  ] };
@@ -77,66 +58,54 @@ xkb_symbols "type6" {
     key <AB10> { [           minus,       underscore                  ] };
 
         include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
-xkb_symbols "type4" {
-
-     name[Group1]="Portugal - Sun type 4";
-
-    key <BKSL> { [ bracketleft, braceleft, guillemotleft]     };
-    key <BRCR> { [ bracketright, braceright, guillemotright]  };
-    key <AE02> { [ 2, quotedbl, at          ]       };
-    key <AE03> { [ 3, numbersign, sterling    ]       };
-    key <AE04> { [ 4, dollar, section     ]       };
-    key <AE06> { [ 6, ampersand, notsign     ]       };
-    key <AE07> { [ 7, slash             ]                       };
-    key <AE08> { [ 8, parenleft         ]                       };
-    key <AE09> { [ 9, parenright, backslash   ]       };
-    key <AE10> { [ 0, equal, bar         ]       };
-    key <AE11> { [ quoteright, question, quoteleft   ]       };
-    key <AE12> { [ exclamdown, questiondown ]                    };
-    key <AD03> { [ e, E, EuroSign    ]       };
-    key <AD11> { [ dead_diaeresis, asterisk, plus    ]       };
-    key <AD12> { [ dead_acute, dead_grave, asciitilde ]      };
-    key <LCTL> { [ Caps_Lock            ]                       };
-    key <AC10> { [ ccedilla, Ccedilla             ]                       };
-    key <AC11> { [ masculine, ordfeminine]                      };
-    key <TLDE> { [ dead_tilde, dead_circumflex, asciicircum ]    };
-    key <LSGT> { [ less, greater        ]                       };
-    key <AB08> { [ comma, semicolon     ]                       };
-    key <AB09> { [ period, colon        ]                       };
-    key <AB10> { [ minus, underscore    ]                       };
-    key <CAPS> { [ Control_L            ]                       };
-
-	include "level3(ralt_switch)"
+	xkb_symbols "basic" {
+	include "sun_vndr/pt(sun_type6)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "pt(Sundeadkeys)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "pt(sundeadkeys)"
+};
 
 partial alphanumeric_keys
-xkb_symbols "type5" {
-    
-    name[Group1]="Portugal - Sun type 5";
+	xkb_symbols "nodeadkeys" {
+	include "pt(nodeadkeys)"
+};
 
-    key <TLDE> { [ backslash, bar       ]                               };
-    key <AE05> { [ 5, percent, asciitilde                  ]};
-    key <AE06> { [ 6, ampersand, asciicircum                 ]};
-    key <AE07> { [ 7, slash,  braceleft                  ]};
-    key <AE08> { [ 8, parenleft,  bracketleft                ]};
-    key <AE09> { [ 9, parenright,  bracketright               ]};
-    key <AE10> { [ 0, equal,  braceright                 ]};
-    key <AE11> { [ quoteright, question, quoteleft                   ]};
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "pt(mac)"
+};
 
-    key <AD11> { [ plus, asterisk, dead_diaeresis         ]};
+partial alphanumeric_keys
+	xkb_symbols "mac_sundeadkeys" {
+	include "pt(mac_sundeadkeys)"
+};
 
-	include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "mac_nodeadkeys" {
+	include "pt(mac_nodeadkeys)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "nativo" {
+	include "pt(nativo)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "nativo-us" {
+	include "pt(nativo-us)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/pt(type6)"
+partial alphanumeric_keys
+	xkb_symbols "nativo-epo" {
+	include "pt(nativo-epo)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
index 07241a3ee..1783db4bf 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Romania";
+    name[Group1]="Romanian (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
    key <TLDE> { [          grave,    asciitilde,	grave,    asciitilde ] };
    key <AE01> { [              1,        exclam,	dead_tilde                ] };
@@ -108,10 +87,39 @@ xkb_symbols "type6" {
    key <AB10> { [          slash,      question,	slash,      question ] };
 
 	include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ro(type6)"
+	include "sun_vndr/ro(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cedilla" {
+	include "ro(cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std" {
+	include "ro(std)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "std_cedilla" {
+	include "ro(std_cedilla)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ro(winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh_dobruja" {
+	include "ro(crh_dobruja)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ergonomic" {
+	include "ro(ergonomic)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index cfa27d08a..1ea594754 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,36 +27,16 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-partial alphanumeric_keys
-xkb_symbols "type6" {
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-     name[Group1]= "Russia";
+	name[Group1]= "Russian (Sun Type 6/7)";
 
-     key.type[group1]="FOUR_LEVEL";
+	include "sun_vndr/us(sun_type6)"
 
+	key.type[group1]="FOUR_LEVEL";
 
-    key	<AE01> { [		1,	    exclam 	] };
+    key	<AE01> { [		1,	    exclam, 1,          exclam 	] };
     key	<AE02> { [		2,        quotedbl, 2, at	] };
     key	<AE03> { [		3,      numerosign, 3,  numbersign	] };
     key	<AE04> { [		4,       percent, 4,      dollar 	] };
@@ -65,7 +45,7 @@ xkb_symbols "type6" {
     key	<AE08> { [		8,	 semicolon, 8, asterisk 	] };
     key	<BKSL> { [           slash,        question, backslash,             bar	] };
     key	<AB10> { [      ediaeresis,      Ediaeresis,	    slash,	  question 	] };
-    key <LSGT> { [       backslash,             bar      ] };
+    key <LSGT> { [       backslash,             bar, backslash,             bar ] };
 
     key	<AD01> { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q	] };
     key	<AD02> { [    Cyrillic_tse,    Cyrillic_TSE, w, W	] };
@@ -101,11 +81,124 @@ xkb_symbols "type6" {
     key	<AB09> { [     Cyrillic_yu,     Cyrillic_YU, period,         greater	] };
 
     include "level3(ralt_switch)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/ru(sun_type6)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ru(winkeys)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/ru(type6)"
+partial alphanumeric_keys
+	xkb_symbols "common" {
+	include "ru(common)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ru(legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "ru(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ru(typewriter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter-legacy" {
+	include "ru(typewriter-legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ru(phonetic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic_winkeys" {
+	include "ru(phonetic_winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "tt" {
+	include "ru(tt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "os_legacy" {
+	include "ru(os_legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "os_winkeys" {
+	include "ru(os_winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cv" {
+	include "ru(cv)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "udm" {
+	include "ru(udm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "cv_latin" {
+	include "ru(cv_latin)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "kom" {
+	include "ru(kom)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "sah" {
+	include "ru(sah)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "xal" {
+	include "ru(xal)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "dos" {
+	include "ru(dos)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bak" {
+	include "ru(bak)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "srp" {
+	include "ru(srp)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "chm" {
+	include "ru(chm)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "chu" {
+	include "ru(chu)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ruu" {
+	include "ru(ruu)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
index d27001466..506d9c377 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,31 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+partial default alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-partial alphanumeric_keys
-xkb_symbols "type6" {
+    name[Group1]="Swedish (Sun Type 6/7)";
 
-    name[Group1]="Sweden";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE> { [         section,         onehalf                ] };
     key <LSGT> { [            less,         greater,           bar ] };
@@ -77,203 +58,54 @@ xkb_symbols "type6" {
 
         include "level3(ralt_switch)"
         include "kpdl(comma)"
-
 };
 
-// Swedish layout for a Type 5/5c Sun keyboard
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
-    key <AD12> { [                      ],      [  asciitilde ] };
-
-    key <RTSH> { [      Shift_R         ]       };
-
-    key <LALT> { [      Alt_L           ]       };
-    key <ALGR> { [      Mode_switch     ]       };
-    key <LMTA> { [      Meta_L          ]       };
-    key <RMTA> { [      Meta_R          ]       };
-    key <COMP> { [      Multi_key       ]       };
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1           ]                       };
-    key <FK02> { [ F2           ]                       };
-    key <FK03> { [ F3           ]                       };
-    key <FK04> { [ F4           ]                       };
-    key <FK05> { [ F5           ]                       };
-    key <FK06> { [ F6           ]                       };
-    key <FK07> { [ F7           ]                       };
-    key <FK08> { [ F8           ]                       };
-    key <FK09> { [ F9           ]                       };
-    key <FK10> { [ F10          ]                       };
-    key <FK11> { [ F11          ],      [ SunF36]       };
-    key <FK12> { [ F12          ],      [ SunF37]       };
-    key <STOP> { [ Cancel       ],      [ F11   ]       };
-    key <AGAI> { [ Redo         ],      [ F12   ]       };
-    key <PROP> { [ SunProps     ],      [ F13   ]       };
-    key <UNDO> { [ Undo         ],      [ F14   ]       };
-    key <FRNT> { [ SunFront     ],      [ F15   ]       };
-    key <COPY> { [ SunCopy      ],      [ F16   ]       };
-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
-    key <PAST> { [ SunPaste     ],      [ F18   ]       };
-    key <FIND> { [ Find         ],      [ F19   ]       };
-    key <CUT>  { [ SunCut       ],      [ F20   ]       };
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
-    key <SCLK> { [ Scroll_Lock  ]                       };
-    key <PAUS> { [ Pause        ],      [ Break ]       };
-    key <LEFT> { [ Left         ]                       };
-    key <RGHT> { [ Right        ]                       };
-    key <UP>   { [ Up           ]                       };
-    key <DOWN> { [ Down         ]                       };
-
-    key <DELE> { [ Delete       ]                       };
-    key <INS>  { [ Insert       ]                       };
-    key <PGUP> { [ Prior        ]                       };
-    key <PGDN> { [ Next         ]                       };
-    key <HOME> { [ Home         ]                       };
-    key <END>  { [ End          ]                       };
-    key <HELP> { [ Help         ]                       };
-    // End "Editing" section
-    
-    // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock             ]                               };
-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
-    key <KPSU> { [ KP_Subtract          ]                               };
-
-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
-    key <KPAD> { [      KP_Add          ]                               };
-
-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
-
-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
-    key <KPEN> { [      KP_Enter        ]                               };
-
-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
-    // End "Keypad" section, 
-
-    // Begin "four keys up on the right"
-    key <MUTE> { [  SunAudioMute,       SunVideoDegauss         ]       };
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]       };
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness ]       };
-    key <POWR> { [  SunPowerSwitch,     SunPowerSwitchShift     ]       };
-    // End "four keys up on the right"
-
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1   { Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3   { Mode_switch };
-    modifier_map Mod4   { Alt_L };
-    // End modifier mappings
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/se(sun_type6)"
 };
 
-// Swedish layout for a Type 4 Sun keyboard
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)+se(basic)"
-
-    // Begin alphanumeric section
-    // These two are not supposed to be dead.
-    // A few others supposedly ARE dead, but don't care for now.
-    key <AC12> { [ apostrophe, asterisk ],      [       grave ] };
-    key <AD12> { [                      ],      [  asciitilde ] };
-
-    key <AF14> { [      asciitilde,     asciicircum     ] };
-
-    key <RTSH> { [      Shift_R         ]       };
-
-    key <LALT> { [      Alt_L           ]       };
-    key <ALGR> { [      Mode_switch     ]       };
-    key <LMTA> { [      Meta_L          ]       };
-    key <RMTA> { [      Meta_R          ]       };
-    key <COMP> { [      Multi_key       ]       };
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1           ]                       };
-    key <FK02> { [ F2           ]                       };
-    key <FK03> { [ F3           ]                       };
-    key <FK04> { [ F4           ]                       };
-    key <FK05> { [ F5           ]                       };
-    key <FK06> { [ F6           ]                       };
-    key <FK07> { [ F7           ]                       };
-    key <FK08> { [ F8           ]                       };
-    key <FK09> { [ F9           ]                       };
-    key <FK10> { [ F10          ]                       };
-    key <FK11> { [ F11          ],      [ SunF36]       };
-    key <FK12> { [ F12          ],      [ SunF37]       };
-    key <STOP> { [ Cancel       ],      [ F11   ]       };
-    key <AGAI> { [ Redo         ],      [ F12   ]       };
-    key <PROP> { [ SunProps     ],      [ F13   ]       };
-    key <UNDO> { [ Undo         ],      [ F14   ]       };
-    key <FRNT> { [ SunFront     ],      [ F15   ]       };
-    key <COPY> { [ SunCopy      ],      [ F16   ]       };
-    key <OPEN> { [ SunOpen      ],      [ F17   ]       };
-    key <PAST> { [ SunPaste     ],      [ F18   ]       };
-    key <FIND> { [ Find         ],      [ F19   ]       };
-    key <CUT>  { [ SunCut       ],      [ F20   ]       };
-    // End "Function" section
+partial alphanumeric_keys
+	xkb_symbols "se" {
+	include "se(se)"
+};
 
-    // Begin "Editing" section
-    key <LNFD> { [ Linefeed     ]       };
-    key <DELE> { [ Delete       ]                       };
-    key <PRSC> { [ Print        ],      [ Sys_Req, SunSys_Req ] };
-    key <SCLK> { [ Scroll_Lock  ]                       };
-    key <PAUS> { [ Pause        ],      [ Break ]       };
-    key <HELP> { [ Help         ]                       };
-    // End "Editing" section
-    
-   // Begin "Keypad" section
-    key <NMLK> { [ Num_Lock             ]                               };
-    key <KPEQ> { [ KP_Equal             ]                               };
-    key <KPDV> { [ KP_Divide            ],      [       F25     ]       };
-    key <KPMU> { [ KP_Multiply          ],      [       F26     ]       };
-    key <KPSU> { [ KP_Subtract          ]                               };
+partial alphanumeric_keys
+	xkb_symbols "nodeadkeys" {
+	include "se(nodeadkeys)"
+};
 
-    key  <KP7> { [  KP_Home,    KP_7    ],      [       F27     ]       };
-    key  <KP8> { [  KP_Up,      KP_8    ],      [       F28     ]       };
-    key  <KP9> { [  KP_Prior,   KP_9    ],      [       F29     ]       };
-    key <KPAD> { [      KP_Add          ]                               };
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "se(dvorak)"
+};
 
-    key  <KP4> { [  KP_Left,    KP_4    ],      [       F30     ]       };
-    key  <KP5> { [  KP_Begin,   KP_5    ],      [       F31     ]       };
-    key  <KP6> { [  KP_Right,   KP_6    ],      [       F32     ]       };
+partial alphanumeric_keys
+	xkb_symbols "rus" {
+	include "se(rus)"
+};
 
-    key  <KP1> { [  KP_End,     KP_1    ],      [       F33     ]       };
-    key  <KP2> { [  KP_Down,    KP_2    ],      [       F34     ]       };
-    key  <KP3> { [  KP_Next,    KP_3    ],      [       F35     ]       };
-    key <KPEN> { [      KP_Enter        ]                               };
+partial alphanumeric_keys
+	xkb_symbols "rus_nodeadkeys" {
+	include "se(rus_nodeadkeys)"
+};
 
-    key  <KP0> { [  KP_Insert,  KP_0    ]                               };
-    key <KPDL> { [  KP_Delete,  KP_Decimal ]                            };
-    // End "Keypad" section, 
+partial alphanumeric_keys
+	xkb_symbols "smi" {
+	include "se(smi)"
+};
 
-    // Begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1   { Alt_L };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3   { Mode_switch };
-    modifier_map Mod4   { Meta_L };
-    modifier_map Mod5   { Meta_R };
-    // End modifier mappings
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "se(mac)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "svdvorak" {
+	include "se(svdvorak)"
+};
 
-partial default alphanumeric_keys
-	xkb_symbols "basic" {
-	include "sun_vndr/se(type6)"
+partial alphanumeric_keys
+	xkb_symbols "swl" {
+	include "se(swl)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index 9c909763f..e3507f0c4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Slovakia";
+    name[Group1]="Slovak (Sun Type 6/7)";
 
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { 	[       semicolon, dead_abovering, quoteleft,         asciitilde  ]	};
     key <AE01>  { 	[	     plus,         1,	exclam,               asciitilde  ]	};
@@ -105,5 +84,20 @@ xkb_symbols "type6" {
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/sk(type6)"
+	include "sun_vndr/sk(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "bksl" {
+	include "sk(bksl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty" {
+	include "sk(qwerty)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "qwerty_bksl" {
+	include "sk(qwerty_bksl)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
index c435744ee..d8289506e 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/solaris
@@ -1,6 +1,5 @@
-//-------------------------------------------------------------------------
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,187 +26,87 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
-//-------------------------------------------------------------------------
-//
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
 
-// Default map provides backwards compatibility with Sun keyboards from
-// long ago and the key mappings still used in Solaris Xsun today
-
-partial default
+partial
 xkb_symbols "defaults_common" {
 
-    // Left side keys were labeled L1-L10 on Sun Type 2 & Type 3 keyboards
-    // and the names have stuck (you can spot a longtime Sun admin when you
-    // hear them say to hit "L1-A" to enter the OpenBoot PROM)
-    // These names get mapped to the keysyms F11-F20
-    key <STOP> { [ L1,  L1              ], [ SunStop    ]       };
-    key <AGAI> { [ L2,  L2              ], [ SunAgain   ]       };
-    key <PROP> { [ L3,  L3              ], [ SunProps   ]       };
-    key <UNDO> { [ L4,  L4              ], [ SunUndo    ]       };
-    key <FRNT> { [ L5,  L5              ], [ SunFront   ]       };
-    key <COPY> { [ L6,  L6              ], [ SunCopy    ]       };
-    key <OPEN> { [ L7,  L7              ], [ SunOpen    ]       };
-    key <PAST> { [ L8,  L8              ], [ SunPaste   ]       };
-    key <FIND> { [ L9,  L9              ], [ SunFind    ]       };
-    key <CUT>  { [ L10, L10             ], [ SunCut     ]       };
-
-    // And on the right side, the function keys were labeled R1-R15,
-    // which get mapped to the keysyms F21-F35
-    // This includes the keys that became the numeric keypad
-    key <PAUS> { [ R1,  R1              ], [ Pause              ] };
-    key <PRSC> { [ R2,  R2              ], [ Print              ] };
-    key <SCLK> { [ R3,  R3              ], [ Scroll_Lock, Break ] };
-
-    key <KPEQ> { [ KP_Equal             ], [ R4, KP_Equal       ] };
-    key <KPDV> { [ KP_Divide            ], [ R5, KP_Divide      ] };
-    key <KPMU> { [ KP_Multiply          ], [ R6, KP_Multiply    ] };
-
-    key  <KP7> { [ KP_Home,  KP_7, R7   ], [ R7, KP_7, Home     ] };
-    key  <KP8> { [ KP_Up,    KP_8, R8   ], [ R8, KP_8, Up       ] };
-    key  <KP9> { [ KP_Prior, KP_9, R9   ], [ R9, KP_9, Prior    ] };
-
-    key  <KP4> { [ KP_Left,  KP_4, R10  ], [ R10, KP_4, Left    ] };
-    key  <KP5> { [ KP_Begin, KP_5, R11  ], [ R11, KP_5          ] };
-    key  <KP6> { [ KP_Right, KP_6, R12  ], [ R12, KP_6, Right   ] };
-
-    key  <KP1> { [ KP_End,   KP_1, R13  ], [ R13, KP_1, End     ] };
-    key  <KP2> { [ KP_Down,  KP_2, R14  ], [ R14, KP_2, Down    ] };
-    key  <KP3> { [ KP_Next,  KP_3, R15  ], [ R15, KP_3, Next    ] };
-
-    // F11 & F12 are mapped to SunF36 and SunF37 since they were added
-    // after F11-F35 were already assigned on Sun keyboards
-    key <FK11> { [ SunF36               ], [ F11                ] };
-    key <FK12> { [ SunF37               ], [ F12                ] };
-
-    // These were added to the keyboard much later and simply got mapped
-    // to their logical names
-    key <HELP> { [ Help                 ]                       };
-    key <MUTE> { [  SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [  SunAudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [  SunAudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [  XF86Sleep,		XF86Hibernate		]	};
-
-//    key <LALT> { [ Alt_L                ]                       };
-//    key <LMTA> { [ Meta_L               ]                       };
-//    key <RMTA> { [ Meta_R               ]                       };
-//    key <COMP> { [ Multi_key            ]                       };
+    key <MUTE> { [ XF86AudioMute         ] };
+    key <VOL-> { [ XF86AudioLowerVolume  ] };
+    key <VOL+> { [ XF86AudioRaiseVolume  ] };
+    key <POWR> { [ XF86PowerOff          ] };
+    key <STOP> { [ Cancel                ] };
+    key <AGAI> { [ Redo                  ] };
+    key <PROP> { [ SunProps              ] };
+    key <UNDO> { [ Undo                  ] };
+    key <FRNT> { [ SunFront              ] };
+    key <COPY> { [ XF86Copy              ] };
+    key <OPEN> { [ SunOpen               ] };
+    key <PAST> { [ XF86Paste             ] };
+    key <FIND> { [ Find                  ] };
+    key <CUT>  { [ XF86Cut               ] };
+    key <HELP> { [ Help                  ] };
+    key <LNFD> { [ Linefeed              ] };
+
+    key <LALT> { [	Alt_L,  Alt_L	] };
+    key <LWIN> { [	Meta_L	        ] };
+    key <RWIN> { [	Meta_R			] };
+
+// The following is needed for virtual hotkeys
+
+    key <I150> { [ XF86Sleep             ] };
+    key <I160> { [ XF86ScreenSaver       ] };
+    key <I235> { [ XF86Display           ] };
+
+// Common Sun Modifiers
+
+    modifier_map Shift	{ Shift_R, Shift_L };
+    modifier_map Mod2	{ Num_Lock };
+    modifier_map Mod4   { Meta_L, Meta_R };
+
 };
 
 partial default
 xkb_symbols "defaults" {
+
     include "sun_vndr/solaris(defaults_common)"
-//    key <RALT> { [ Mode_switch          ]                       };
-//    key <ALGR> { [ Mode_switch          ]                       };
-
-    // begin modifier mappings
-//    modifier_map Shift          { Shift_R, Shift_L };
-//    modifier_map Mod1           { Alt_L };
-//    modifier_map Mod2           { Num_Lock };
-//    modifier_map Mod3           { Alt_R, Mode_switch };
-//    modifier_map Mod4           { Meta_L, Meta_R };
+
+    modifier_map Mod1   { Alt_L };
+
 };
 
-partial default
+partial
 xkb_symbols "defaults_type7jp" {
+
     include "sun_vndr/solaris(defaults_common)"
-    // begin modifier mappings
-    modifier_map Shift          { Shift_R, Shift_L };
-    modifier_map Mod1           { Alt_L , Alt_R};
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3           { Mode_switch };
-    modifier_map Mod4           { Meta_L, Meta_R };
-};
 
-// Map the keys to the actual key names instead of the ancient Sun function
-// keys
-partial
-xkb_symbols "keynames" {
-    key <FK11> { [ F11          ],      [ SunF36   ]    };
-    key <FK12> { [ F12          ],      [ SunF37   ]    };
-
-    key <STOP> { [ Cancel	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ SunCopy	],	[ F16	]	};
-    key <OPEN> { [ SunOpen	],	[ F17	]	};
-    key <PAST> { [ SunPaste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ SunCut	],	[ F20	]	};
-
-    key <HELP> { [ Help		]	                };
-
-    key <PAUS> {  [  Pause                      ]       };
-    key <PRSC> {  [  Print                      ]       };
-    key <SCLK> {  [  Scroll_Lock, Break         ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ]       };
-
-    key <KPEN> {        [       KP_Enter        ]       };
-    key <KPEQ> {        [       KP_Equal        ]       };
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume, SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume, SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    key <LALT> { [ Alt_L                ]                       };
-    key <RALT> { [ Mode_switch          ]                       };
-    key <ALGR> { [ Mode_switch          ]                       };
-    key <LMTA> { [ Meta_L               ]                       };
-    key <RMTA> { [ Meta_R               ]                       };
-    key <COMP> { [ Multi_key            ]                       };
+    modifier_map Mod1  { Alt_L, Alt_R   };
 
 };
 
-// Map the keys to the XFree86 key names instead of the Sun key names
 partial
-xkb_symbols "xf86keynames" {
-    key <STOP> { [ XF86Stop	],	[ F11	]	};
-    key <AGAI> { [ Redo		],	[ F12	]	};
-    key <PROP> { [ SunProps	],	[ F13	]	};
-    key <UNDO> { [ Undo		],	[ F14	]	};
-    key <FRNT> { [ SunFront	],	[ F15	]	};
-    key <COPY> { [ XF86Copy	],	[ F16	]	};
-    key <OPEN> { [ XF86Open	],	[ F17	]	};
-    key <PAST> { [ XF86Paste	],	[ F18	]	};
-    key <FIND> { [ Find		],	[ F19	]	};
-    key <CUT>  { [ XF86Cut	],	[ F20	]	};
-
-    key <MUTE> { [ XF86AudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ XF86AudioLowerVolume,SunVideoLowerBrightness ]	};
-    key <VOL+> { [ XF86AudioRaiseVolume,SunVideoRaiseBrightness	]	};
-    key <POWR> { [ XF86Sleep,		XF86PowerDown	]	};
+xkb_symbols "sun_compat" {
+
+	key <STOP> { [ L1,        L1,  SunStop    ]       };
+	key <AGAI> { [ L2,        L2,  SunAgain   ]       };
+	key <PROP> { [ L3,        L3,  SunProps   ]       };
+	key <UNDO> { [ L4,        L4,  SunUndo    ]       };
+	key <FRNT> { [ L5,        L5,  SunFront   ]       };
+	key <COPY> { [ L6,        L6,  SunCopy    ]       };
+	key <OPEN> { [ L7,        L7,  SunOpen    ]       };
+	key <PAST> { [ L8,        L8,  SunPaste   ]       };
+	key <FIND> { [ L9,        L9,  SunFind    ]       };
+	key <CUT>  { [ L10,       L10, SunCut     ]       };
+
+// F11 & F12 are mapped to SunF36 and SunF37 since they were added
+// after F11-F35 were already assigned on Sun keyboards
+	key <FK11> { [ SunF36               ], [ F11                ] };
+	key <FK12> { [ SunF37               ], [ F12                ] };
+
+// These were added to the keyboard much later and simply got mapped
+// to their logical names
+	key <HELP> { [  Help						] };
+	key <MUTE> { [  SunAudioMute,        SunVideoDegauss		] };
+	key <VOL-> { [  SunAudioLowerVolume, SunVideoLowerBrightness	] };
+	key <VOL+> { [  SunAudioRaiseVolume, SunVideoRaiseBrightness	] };
+	key <POWR> { [  XF86Sleep,           XF86Hibernate		] };
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 18ff4f0b1..b926349ab 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,32 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+default partial alphanumeric_keys
+xkb_symbols "sun_type6" {
 
+    name[Group1]="Turkish (Sun Type 6)";
 
-partial alphanumeric_keys
-xkb_symbols "type6" {
-
-    name[Group1]="Turkey - (Q)";
+	include "sun_vndr/us(sun_type6)"
 
     key <TLDE>  { [  quotedbl,     eacute                ] };
     key <AE01>	{ [         1,     exclam                ] };
@@ -83,10 +63,69 @@ xkb_symbols "type6" {
     key <AB10>	{ [    period,      colon               ] };
 
 	include "level3(ralt_switch)"
-
 };
 
-partial default alphanumeric_keys
+partial alphanumeric_keys
         xkb_symbols "basic" {
-        include "sun_vndr/tr(type6)"
+        include "sun_vndr/tr(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "f" {
+	include "tr(f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "alt" {
+	include "tr(alt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "Sundeadkeys" {
+	include "tr(Sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "sundeadkeys" {
+	include "tr(sundeadkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku" {
+	include "tr(ku)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku_f" {
+	include "tr(ku_f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "ku_alt" {
+	include "tr(ku_alt)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "tr(intl)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "tr(olpc)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh" {
+	include "tr(crh)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh_f" {
+	include "tr(crh_f)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "crh_alt" {
+	include "tr(crh_alt)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
deleted file mode 100644
index f098f9f27..000000000
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
+++ /dev/null
@@ -1,261 +0,0 @@
-//
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, and/or sell copies of the Software, and to permit persons
-// to whom the Software is furnished to do so, provided that the above
-// copyright notice(s) and this permission notice appear in all copies of
-// the Software and that both the above copyright notice(s) and this
-// permission notice appear in supporting documentation.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-// OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-// INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-// FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-// NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-// WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-// 
-// Except as contained in this notice, the name of a copyright holder
-// shall not be used in advertising or otherwise to promote the sale, use
-// or other dealings in this Software without prior written authorization
-// of the copyright holder.
-//
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
-// US/ASCII layout for a Type 4 Sun keyboard
-
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
-xkb_symbols "type4basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]			};
-    key <LALT> { [ Alt_L		]			};
-    key <ALGR> { [ Mode_switch		]			};
-    key <LMTA> { [ Meta_L		]			};
-    key <RMTA> { [ Meta_R		]			};
-    key <LNFD> { [ Linefeed		]			};
-    key <COMP> { [ Multi_key		]			};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1,	L1		], [ SunStop	]	};
-    key <AGAI> { [ L2,	L2		], [ SunAgain	]	};
-    key <PROP> { [ L3,	L3		], [ SunProps	]	};
-    key <UNDO> { [ L4,	L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5,	L5		], [ SunFront	]	};
-    key <COPY> { [ L6,	L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7,	L7		], [ SunOpen	]	};
-    key <PAST> { [ L8,	L8		], [ SunPaste	]	};
-    key <FIND> { [ L9,	L9		], [ SunFind	]	};
-    key <CUT>  { [ L10,	L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2		], [ Print		] };
-    key <SCLK> { [ R3,	R3		], [ Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1		], [ Pause		] };
-    key <DELE> { [ Delete		]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]			};
-    key <KPEQ> { [ R4,	R4 		], [ KP_Equal		] };
-    key <KPDV> { [ R5,	R5		], [ KP_Divide		] };
-    key <KPMU> { [ R6,	R6		], [ KP_Multiply	] };
-    key <KPSU> { [ KP_Subtract		]			};
-
-    key  <KP7> { [ R7,	R7		], [ KP_7, Home		] };
-    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP8> { [ R8,	R8		], [ KP_8		] };
-    key  <KP9> { [ R9,	R9		], [ KP_9, Prior	] };
-    key <KPAD> { [ KP_Add		]			};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		] };
-    key  <KP5> { [ R11,	R11		], [ KP_5		] };
-    key  <KP6> { [ Right, R12		], [ KP_6		] };
-
-    key  <KP1> { [ R13,	R13		], [ KP_1,	End	] };
-    key  <KP2> { [ Down, R14		], [ KP_2		] };
-    key  <KP3> { [ R15,	R15		], [ KP_3,	Next	] };
-    key <KPEN> { [ KP_Enter		]			}; 
-    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0		]	};
-    key <KPDL> { [ Delete, Delete	], [ KP_Decimal ]	};
-    // End "Keypad" section
-
-
-    // begin modifier mappings
-    modifier_map Shift  	{ Shift_R, Shift_L };
-    modifier_map Mod1   	{ Meta_L, Meta_R };
-    modifier_map Mod2           { Num_Lock };
-    modifier_map Mod3   	{ Mode_switch };
-    modifier_map Mod4		{ Alt_L };
-};
-
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-};
-
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
-    include "us(basic)"
-
-    key <RTSH> { [ Shift_R		]	};
-    key <LALT> { [ Alt_L		]	};
-    key <ALGR> { [ Mode_switch		]	};
-    key <LMTA> { [ Meta_L		]	};
-    key <RMTA> { [ Meta_R		]	};
-    key <COMP> { [ Multi_key		]	};
-    // End alphanumeric section
-
-    // Begin "Function" section
-    key <FK01> { [ F1			]			};
-    key <FK02> { [ F2			]			};
-    key <FK03> { [ F3			]			};
-    key <FK04> { [ F4			]			};
-    key <FK05> { [ F5			]			};
-    key <FK06> { [ F6			]			};
-    key <FK07> { [ F7			]			};
-    key <FK08> { [ F8			]			};
-    key <FK09> { [ F9			]			};
-    key <FK10> { [ F10			]			};
-    key <FK11> { [ SunF36		]			};
-    key <FK12> { [ SunF37		]			};
-    key <STOP> { [ L1, L1		], [ SunStop	]	};
-    key <AGAI> { [ L2, L2		], [ SunAgain	]	};
-    key <PROP> { [ L3, L3		], [ SunProps	]	};
-    key <UNDO> { [ L4, L4		], [ SunUndo	]	};
-    key <FRNT> { [ L5, L5		], [ SunFront	]	};
-    key <COPY> { [ L6, L6		], [ SunCopy	]	};
-    key <OPEN> { [ L7, L7		], [ SunOpen	]	};
-    key <PAST> { [ L8, L8		], [ SunPaste	]	};
-    key <FIND> { [ L9, L9		], [ SunFind	]	};
-    key <CUT>  { [ L10, L10		], [ SunCut	]	};
-    // End "Function" section
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2 		], [ Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3		], [ Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1		], [ Pause, Break	]	};
-    key <LEFT> { [ Left			]			};
-    key <RGHT> { [ Right		]			};
-    key <UP>   { [ Up			]			};
-    key <DOWN> { [ Down			]			};
-
-    key <DELE> { [ Delete		]			};
-    key <INS>  { [ Insert		]			};
-    key <PGUP> { [ Prior		]			};
-    key <PGDN> { [ Next			]			};
-    key <HOME> { [ Home			]			};
-    key <END>  { [ End			]			};
-    key <HELP> { [ Help			]			};
-
-    // End "Editing" section, begin "Keypad"
-    key <NMLK> { [ Num_Lock 		]				};
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
-    key <KPSU> { [ R4, R4		], [ KP_Subtract	]	};
-
-    key  <KP7> { [ R7, R7		], [ KP_7, Home		]	};
-    key  <KP8> { [ Up, R8		], [ KP_8		]	};
-    key  <KP9> { [ R9, R9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
-
-    key  <KP4> { [ Left, R10		], [ KP_4		]	};
-    key  <KP5> { [ R11,	R11		], [ KP_5		]	};
-    key  <KP6> { [ Right, R12		], [ KP_6		]	};
-
-    key  <KP1> { [ R13,	R13		], [ KP_1, End		]	};
-    key  <KP2> { [ Down, R14		], [ KP_2		]	};
-    key  <KP3> { [ R15,	R15		], [ KP_3		]	};
-    key <KPEN> { [ KP_Enter		]				};
-
-    key  <KP0> { [ KP_Insert, KP_Insert	], [ KP_0		]	};
-    key <KPDL> { [ KP_Delete, KP_Delete ], [ KP_Decimal 	]	};
-    // End "Keypad" section, 
-    // begin "four keys up on the right"
-
-    key <MUTE> { [ SunAudioMute,	SunVideoDegauss		]	};
-    key <VOL-> { [ SunAudioLowerVolume,	SunVideoLowerBrightness ]	};
-    key <VOL+> { [ SunAudioRaiseVolume,	SunVideoRaiseBrightness	]	};
-    key <POWR> { [ SunPowerSwitch,	SunPowerSwitchShift	]	};
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_R };
-    modifier_map Mod1	{ Meta_L, Meta_R };
-    modifier_map Mod2   { Num_Lock };
-    modifier_map Mod3	{ Alt_R };
-    modifier_map Mod4	{ Alt_L };
-};
-
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar	]	};
-};
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
index d2d3952e4..2296ad16a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,52 +27,34 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
+default partial alphanumeric_keys
+xkb_symbols "sun_type6" {
+
+	name[Group1]= "Taiwanese (Sun Type 6/7)";
+
+	include "sun_vndr/us(sunbasic)"
 
-// Taiwanese layout for a Type 6 Sun keyboard
-partial
-xkb_symbols "type6" {
-    // A few keys are different from US layout - only those are shown here
     key <ALGR> { [ Henkan_Mode          ]                       };
     key <BKSL> { [ backslash, bar,  brokenbar   ]               };
 
 };
 
-
-// Taiwanese layout for a Type 4 Sun keyboard
-
-xkb_symbols "type4" {
-
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
-
-    key <COMP> { [ Henkan_Mode		]			};
-
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/tw(sun_type6)"
 };
 
-// Taiwanese layout for a Type 5 Sun keyboard
-xkb_symbols "type5" {
+partial alphanumeric_keys
+	xkb_symbols "tw" {
+	include "tw(tw)"
+};
 
-    // A few keys are different
-    key <ALGR> { [ Henkan_Mode		]			};
-    key <BKSL> { [ backslash, bar,  brokenbar	]		};
+partial alphanumeric_keys
+	xkb_symbols "indigenous" {
+	include "tw(indigenous)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "saisiyat" {
+	include "tw(saisiyat)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
index 98d39ecde..b53b0d874 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -27,33 +27,12 @@
 // of the copyright holder.
 //
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-
 partial default alphanumeric_keys
-xkb_symbols "type6" {
+xkb_symbols "sun_type6" {
 
-    name[Group1]="Ukraine";
+    name[Group1]="Ukrainian (Sun Type 6)";
 
+	include "sun_vndr/us(sun_type6)"
 
     key	<TLDE> {	[	    grave,	asciitilde,	apostrophe,	asciitilde	]	};
     key	<AE01> {	[		1,	    exclam,	1,	    exclam 	]	};
@@ -108,10 +87,49 @@ xkb_symbols "type6" {
     key	<AB10> {	[	    slash,	  question,	slash,	  question	        ]	};
 
 	include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
 	xkb_symbols "basic" {
-	include "sun_vndr/ua(type6)"
+	include "sun_vndr/ua(sun_type6)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "unicode" {
+	include "ua(unicode)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "legacy" {
+	include "ua(legacy)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "winkeys" {
+	include "ua(winkeys)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "typewriter" {
+	include "ua(typewriter)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "phonetic" {
+	include "ua(phonetic)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu" {
+	include "ua(rstu)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "rstu_ru" {
+	include "ua(rstu_ru)"
+};
+
+partial alphanumeric_keys
+	xkb_symbols "homophonic" {
+	include "ua(homophonic)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
index 6bc09a2cd..056936a01 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
+// Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the
@@ -26,375 +26,180 @@
 // or other dealings in this Software without prior written authorization
 // of the copyright holder.
 //
-//
-//Copyright 1996, 1998  The Open Group
-//
-//All Rights Reserved.
-//
-//The above copyright notice and this permission notice shall be
-//included in all copies or substantial portions of the Software.
-//
-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-//IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-//OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-//ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-//OTHER DEALINGS IN THE SOFTWARE.
-//
-//Except as contained in this notice, the name of The Open Group shall
-//not be used in advertising or otherwise to promote the sale, use or
-//other dealings in this Software without prior written authorization
-//from The Open Group.
-//
 
-//
-// CDDL HEADER START
-//
-// The contents of this file are subject to the terms of the
-// Common Development and Distribution License (the "License").
-// You may not use this file except in compliance with the License.
-//
-// You can obtain a copy of the license at src/OPENSOLARIS.LICENSE
-// or http://www.opensolaris.org/os/licensing.
-// See the License for the specific language governing permissions
-// and limitations under the License.
-//
-// When distributing Covered Code, include this CDDL HEADER in each
-// file and include the License file at src/OPENSOLARIS.LICENSE.
-// If applicable, add the following below this CDDL HEADER, with the
-// fields enclosed by brackets "[]" replaced with your own identifying
-// information: Portions Copyright [yyyy] [name of copyright owner]
-//
-// CDDL HEADER END
-//
-
-// Symbols shared by all Sun Keyboard layouts
+partial default alphanumeric_keys
 xkb_symbols "sunbasic" {
-    include "srvr_ctrl(xfree86)"
-
-    // Needed for left function keys and volume keys
-    // Need to include this before us(basic) otherwise tilde is mapped to 
-    // a jp key
-    include "inet(evdev)"
 
     include "us(basic)"
-    include "srvr_ctrl(fkey2vt)"
-    include "pc(editing)"
-    include "keypad(x11)"
-
-    key <ESC>  { [ Escape               ]                       };
-
-    // the extra key on most European keyboards
-    key <LSGT> { [ less,    greater,      bar,    brokenbar   ] };
-
-    // these keys are common to almost all layouts
-    key <BKSL> { [ backslash,    bar    ]                       };
-    key <SPCE> { [ space                ]                       };
-
-    key <BKSP> { [ BackSpace            ]                       };
-    key  <TAB> { [ Tab,  ISO_Left_Tab   ]                       };
-    key <RTRN> { [ Return               ]                       };
-
-    key <NMLK> { [ Num_Lock, Pointer_EnableKeys               ] };
-
-    key <COMP> { [ Multi_key            ]                       };
-    // End alphanumeric section
-
-    key <LFSH> { [ Shift_L              ]                       };
-    key <LCTL> { [ Control_L            ]                       };
-
-    key <RTSH> { [ Shift_R              ]                       };
-    key <RCTL> { [ Control_R            ]                       };
-
-
-    // begin modifier mappings
-    modifier_map Shift  { Shift_L, Shift_R };
-    modifier_map Lock   { Caps_Lock };
-    modifier_map Control{ Control_L, Control_R };
-    modifier_map Mod2   { Num_Lock };
-
-    //  Fake keys for virtual<->real modifiers mapping 
-    key <LVL3> { [ ISO_Level3_Shift      ]                     };
-    key <MDSW> { [ Mode_switch           ]                     };
-    modifier_map Mod5   { <LVL3>, <MDSW> };
-
-    key <ALT>  { [ NoSymbol, Alt_L       ]                     };
-    key <LALT> {        [       Alt_L,  Alt_L           ]       };
-    key <LWIN> {        [       Meta_L                  ]       };
-    key <RWIN> {        [       Meta_R                  ]       };
-    modifier_map Mod1   { Alt_L };
-    modifier_map Mod4   { Meta_L, Meta_R };
-
-//    key <LALT> { [ Alt_L		]			};
-//    key <ALGR> { [ Mode_switch	]			};
-//    key <LMTA> { [ Meta_L		]			};
-//    key <RMTA> { [ Meta_R		]			};
-
-    include "sun_vndr/us(left_funkeys)"
-
     include "capslock(capslock)"
-    //include "capslock(shiftlock)"
-
-
-// This default section uses the same symbols as other XKB implementations
-// for greater compatibility & AccessX MouseKeys support, but it is
-// different than the traditional Sun key mappings that date back to the
-// Sun Type 2 keyboard, in which the right side numpad were "R" function
-// keys.  To restore the original behavior, comment out this section and
-// uncomment the section below that lists the R key mappings.
-    key <KPDV> {        [  KP_Divide            ]       };
-    key <KPMU> {        [  KP_Multiply          ]       };
-    key <KPSU> {        [  KP_Subtract          ]       };
-
-    key  <KP7> {        [  KP_Home,     KP_7    ]       };
-    key  <KP8> {        [  KP_Up,       KP_8    ]       };
-    key  <KP9> {        [  KP_Prior,    KP_9    ]       };
-    key <KPAD> {        [       KP_Add          ]       };
-
-    key  <KP4> {        [  KP_Left,     KP_4    ]       };
-    key  <KP5> {        [  KP_Begin,    KP_5    ]       };
-    key  <KP6> {        [  KP_Right,    KP_6    ]       };
-
-    key  <KP1> {        [  KP_End,      KP_1    ]       };
-    key  <KP2> {        [  KP_Down,     KP_2    ]       };
-    key  <KP3> {        [  KP_Next,     KP_3    ]       };
-    key <KPEN> {        [       KP_Enter        ]       };
-
-    key  <KP0> {        [  KP_Insert,   KP_0    ]       };
-    key <KPDL> {  	[  KP_Delete, KP_Decimal ]    	};
-
-// End New Keypad section - Begin Sun traditional Keypad section
-
-//    key  <KP7> { [ R7,        R7              ], [ KP_7, Home         ] };
-//    key  <KP8> { [ Up, R8               ], [ KP_8               ] };
-//    key  <KP9> { [ R9,        R9              ], [ KP_9, Prior        ] };
-//    key <KPAD> { [ KP_Add             ]                       };
-//
-//    key  <KP4> { [ Left, R10          ], [ KP_4               ] };
-//    key  <KP5> { [ R11,       R11             ], [ KP_5               ] };
-//    key  <KP6> { [ Right, R12         ], [ KP_6               ] };
-//
-//    key  <KP1> { [ R13,       R13             ], [ KP_1,      End     ] };
-//    key  <KP2> { [ Down, R14          ], [ KP_2               ] };
-//    key  <KP3> { [ R15,       R15             ], [ KP_3,      Next    ] };
-//    key <KPEN> { [ KP_Enter           ]                       };
-//    key  <KP0> { [ KP_Insert, KP_Insert], [ KP_0              ]       };
-//    key <KPDL> { [ Delete, Delete     ], [ KP_Decimal ]       };
-
-// End "Keypad" section
-
-};
-
-
-xkb_symbols "left_funkeys" {
-    // Suppliment to inet(evdev) for added functionality of left-funkeys
-    //key <STOP> { [ NoSymbol ],      [ L1, L1   ]       };
-    //key <AGAI> { [ NoSymbol ],      [ L2, L2   ]       };
-    //key <PROP> { [ NoSymbol ],      [ L3, L3   ]       };
-    //key <UNDO> { [ NoSymbol ],      [ L4, L4   ]       };
-    //key <FRNT> { [ NoSymbol ],      [ L5, L5   ]       };
-    //key <COPY> { [ NoSymbol ],      [ L6, L6   ]       };
-    //key <OPEN> { [ NoSymbol ],      [ L7, L7   ]       };
-    //key <PAST> { [ NoSymbol ],      [ L8, L8   ]       };
-    //key <FIND> { [ NoSymbol ],      [ L9, L9   ]       };
-    //key <CUT>  { [ NoSymbol ],      [ L10, L10 ]       };
-
-    // The above symbols were chosen for better compatibility withother xkb
-    // mappings.  The old mappings are kepy below in case someone needs them
-    key <STOP> { [ L1,        L1,  SunStop    ]       };
-    key <AGAI> { [ L2,        L2,  SunAgain   ]       };
-    key <PROP> { [ L3,        L3,  SunProps   ]       };
-    key <UNDO> { [ L4,        L4,  SunUndo    ]       };
-    key <FRNT> { [ L5,        L5,  SunFront   ]       };
-    key <COPY> { [ L6,        L6,  SunCopy    ]       };
-    key <OPEN> { [ L7,        L7,  SunOpen    ]       };
-    key <PAST> { [ L8,        L8,  SunPaste   ]       };
-    key <FIND> { [ L9,        L9,  SunFind    ]       };
-    key <CUT>  { [ L10,       L10, SunCut     ]       };
-};
-
-hidden
-xkb_symbols "volumekeys" {
-    // Suppliment to inet(evdev) for added functionality of audio keys
-    key <MUTE> { [ NoSymbol,    SunVideoDegauss         ]       };
-    key <VOL-> { [ NoSymbol,    XF86MonBrightnessDown   ]       };
-    key <VOL+> { [ NoSymbol,    XF86MonBrightnessUp     ]       };
-
-    // The above symbols were chosen for better compatibility withother xkb
-    // mappings.  The old mappings are kepy below in case someone needs them
-    //key <MUTE> { [ SunAudioMute,      SunVideoDegauss         ]       };
-    //key <VOL-> { [ SunAudioLowerVolume,       SunVideoLowerBrightness ]       };
-    //key <VOL+> { [ SunAudioRaiseVolume,       SunVideoRaiseBrightness ]       };
-    //key <POWR> { [ SunPowerSwitch,    SunPowerSwitchShift     ]       };
-};
-
-
-// US/ASCII layout for a Type 4 Sun keyboard
-xkb_symbols "type4basic" {
-    include "sun_vndr/us(sunbasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar,  EuroSign	]	};
-    key <AE05> { [ 5, percent,  EuroSign	]	};
-    key <AD03> { [ e, E,  EuroSign	]	};
-
-    key <LNFD> { [ Linefeed		]			};
-
-    // Begin "Editing" section
-    key <PRSC> { [ R2,	R2,  Print		] };
-    key <SCLK> { [ R3,	R3,  Scroll_Lock, Break	] };
-    key <PAUS> { [ R1,	R1,  Pause		] };
-
-    // End "Editing" section, begin "Keypad"
-    key <KPEQ> { [ R4,	KP_Equal,  KP_Equal		] };
+    include "srvr_ctrl(xfree86)"
 
 };
 
-xkb_symbols "type4" {
-    include "sun_vndr/us(type4basic)"
+partial alphanumeric_keys
+xkb_symbols "sun_type6" {
 
-    key <BKSL> { [ backslash, bar,  brokenbar	]	};
-};
+	name[Group1]= "English (US, Sun Type 6/7)";
 
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5basic" {
     include "sun_vndr/us(sunbasic)"
-    include "sun_vndr/us(volumekeys)"
+    include "eurosign(4)"
+    include "level3(ralt_switch)"
 
-    // Begin "Editing" section
-    key <PRSC> { [ R2, R2,  Print, SunSys_Req	]	};
-    key <SCLK> { [ R3, R3,  Scroll_Lock	]	};
-    key <PAUS> { [ R1, R1,  Pause, Break	]	};
-    // End "Editing" section
+    key <COMP> { [		Multi_key			] };
+    key <SYRQ> { [		SunSys_Req			] };
 };
 
-xkb_symbols "type5" {
-    include "sun_vndr/us(type5basic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar,  EuroSign	]	};
-    key <AE05> { [ 5, percent,  EuroSign	]	};
-    key <AD03> { [ e, E	,  EuroSign	]	};
-    key <BKSL> { [ backslash, bar,  brokenbar	]	};
+partial alphanumeric_keys
+	xkb_symbols "basic" {
+	include "sun_vndr/us(sunbasic)"
 };
 
-// US/ASCII layout for a Type 5 Sun keyboard
-xkb_symbols "type5hobobasic" {
-    include "sun_vndr/us(type5basic)"
+partial alphanumeric_keys
+	xkb_symbols "euro" {
+	include "us(euro)"
 };
 
-xkb_symbols "type5hobo" {
-    include "sun_vndr/us(type5hobobasic)"
-
-    // A few alphanumeric keys are different
-    key <AE04> { [ 4, dollar,  EuroSign   ]       };
-    key <AE05> { [ 5, percent,  EuroSign   ]       };
-    key <AD03> { [ e, E,  EuroSign   ]       };
-    key <BKSL> { [ backslash, bar,  brokenbar  ]       };
+partial alphanumeric_keys
+	xkb_symbols "intl" {
+	include "us(intl)"
+};
 
-    // Here is the hobo keypad:
+partial alphanumeric_keys
+	xkb_symbols "alt-intl" {
+	include "us(alt-intl)"
+};
 
-    key <AE07> { [ 7, ampersand, NoSymbol, NoSymbol, KP_7       ] };
-    key <AE08> { [ 8, asterisk,  NoSymbol, NoSymbol, KP_8       ] };
-    key <AE09> { [ 9, parenleft, NoSymbol, NoSymbol, KP_9       ] };
-    key <AE10> { [ 0, parenright, NoSymbol, NoSymbol, KP_Multiply] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak" {
+	include "us(dvorak)"
+};
 
-    key <AD07> { [ u, U, NoSymbol, NoSymbol, KP_4       ] };
-    key <AD08> { [ i, I, NoSymbol, NoSymbol, KP_5       ] };
-    key <AD09> { [ o, O, NoSymbol, NoSymbol, KP_6       ] };
-    key <AD10> { [ p, P, NoSymbol, NoSymbol, KP_Subtract] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak-intl" {
+	include "us(dvorak-intl)"
+};
 
-    key <AC07> { [ j, J, NoSymbol, NoSymbol, KP_1       ] };
-    key <AC08> { [ k, K, NoSymbol, NoSymbol, KP_2       ] };
-    key <AC09> { [ l, L, NoSymbol, NoSymbol, KP_3       ] };
-    key <AC10> { [ semicolon, colon, NoSymbol, NoSymbol, KP_Add   ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak-alt-intl" {
+	include "us(dvorak-alt-intl)"
+};
 
-    key <RTRN> { [ Return, NoSymbol, NoSymbol, KP_Enter    ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak-l" {
+	include "us(dvorak-l)"
+};
 
-    key <AB07> { [ m, M,  NoSymbol, NoSymbol, KP_0       ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak-r" {
+	include "us(dvorak-r)"
+};
 
-    key <AB09> { [ period, greater, NoSymbol, NoSymbol, KP_Decimal] };
-    key <AB10> { [ slash, question, NoSymbol, NoSymbol, KP_Divide ] };
+partial alphanumeric_keys
+	xkb_symbols "dvorak-classic" {
+	include "us(dvorak-classic)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "dvp" {
+	include "us(dvp)"
+};
 
-xkb_symbols "type6" {
-    include "sun_vndr/us(sunbasic)"
-    include "sun_vndr/us(volumekeys)"
-    include "eurosign(4)"
-    include "level3(ralt_switch)"
+partial alphanumeric_keys
+	xkb_symbols "rus" {
+	include "us(rus)"
+};
 
-    key <SYRQ> { [ SunSys_Req                   ]};
+partial alphanumeric_keys
+	xkb_symbols "mac" {
+	include "us(mac)"
 };
 
+partial alphanumeric_keys
+	xkb_symbols "colemak" {
+	include "us(colemak)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "altgr-intl" {
+	include "us(altgr-intl)"
+};
 
-xkb_symbols "pc101" {
-    include "us(pc101)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
+partial alphanumeric_keys
+	xkb_symbols "classmate" {
+	include "us(classmate)"
 };
 
-xkb_symbols "pc102" {
-    include "us(pc102)"
-    key <RALT> { [ Mode_switch, Meta_R	] };
+partial alphanumeric_keys
+	xkb_symbols "classmate-intl" {
+	include "us(classmate-intl)"
 };
 
-xkb_symbols "pc104" {
-    include "us(pc104)"
+partial alphanumeric_keys
+	xkb_symbols "classmate-alt-intl" {
+	include "us(classmate-alt-intl)"
 };
 
-xkb_symbols "pc101currency" {
+partial alphanumeric_keys
+	xkb_symbols "classmate-altgr-intl" {
+	include "us(classmate-altgr-intl)"
+};
 
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+partial alphanumeric_keys
+	xkb_symbols "olpc" {
+	include "us(olpc)"
 };
 
-xkb_symbols "US101A_Sun" {
+partial alphanumeric_keys
+	xkb_symbols "olpc2" {
+	include "us(olpc2)"
+};
 
-    key <AE04> { [ 4, dollar		], [ EuroSign	]	};
-    key <AE05> { [ 5, percent		], [ EuroSign	]	};
-    key <AD03> { [ e, E			], [ EuroSign	]	};
-    key <BKSL> { [ backslash, bar	], [ brokenbar			]};
+partial alphanumeric_keys
+	xkb_symbols "chr" {
+	include "us(chr)"
+};
 
-    // Begin "Editing" section
-    key <PRSC> { [ L5, L5		], [ Print, SunSys_Req 		]};
-    key <SCLK> { [ L7, L7		], [  Scroll_Lock		]};
-    key <PAUS> { [ L1, L1		], [ Pause, Break 		]};
-    key  <INS> { [ L8, L8		], [  Insert			]};
-    key <HOME> { [ L6, L6		], [  Home			]};
-    key <PGUP> { [ L3, L3		], [  Prior			]};
+partial alphanumeric_keys
+	xkb_symbols "hbs" {
+	include "us(hbs)"
+};
 
+partial alphanumeric_keys
+	xkb_symbols "htcdream" {
+	include "us(htcdream)"
+};
 
-    key <DELE> { [ L10, L10		], [ Delete			]};
-    key  <END> { [ L9, L9		], [  End			]};
-    key <PGDN> { [ L4, L4		], [  Next			]};
+partial alphanumeric_keys
+	xkb_symbols "workman" {
+	include "us(workman)"
+};
 
-    key   <UP> {	[  Up			]	};
-    key <LEFT> {	[  Left			]	};
-    key <DOWN> {	[  Down			]	};
-    key <RGHT> {	[  Right		]	};
+partial alphanumeric_keys
+	xkb_symbols "workman-intl" {
+	include "us(workman-intl)"
+};
 
-    key <KPDV> { [ R5, R5		], [ KP_Divide	]	};
-    key <KPMU> { [ R6, R6		], [ KP_Multiply	]	};
+partial alphanumeric_keys
+	xkb_symbols "cz_sk_de" {
+	include "us(cz_sk_de)"
+};
 
-    key  <KP7> { [ R7, KP_7		], [ KP_7, Home		]	};
-    key  <KP8> { [ KP_Up, KP_8		], [ KP_8		]	};
-    key  <KP9> { [ R9, KP_9		], [ KP_9, Prior	]	};
-    key <KPAD> { [ KP_Add		]				};
+partial alphanumeric_keys
+	xkb_symbols "intl-unicode" {
+	include "us(intl-unicode)"
+};
 
-    key  <KP4> { [ KP_Left, KP_4	], [ KP_4		]	};
-    key  <KP5> { [ R11,	KP_5		], [ KP_5		]	};
-    key  <KP6> { [ KP_Right, KP_6	], [ KP_6		]	};
+partial alphanumeric_keys
+	xkb_symbols "alt-intl-unicode" {
+	include "us(alt-intl-unicode)"
+};
 
-    key  <KP1> { [ R13,	KP_1		], [ KP_1, End		]	};
-    key  <KP2> { [ KP_Down, KP_2	], [ KP_2		]	};
-    key  <KP3> { [ R15,	KP_3		], [ KP_3, Next		]	};
-    key <KPEN> { [ KP_Enter		]				};
+partial alphanumeric_keys
+	xkb_symbols "ats" {
+	include "us(ats)"
+};
 
-    key <LALT> { [ Meta_L		]				};
-    key <RALT> { [ Alt_L		]				};
-    key <RCTL> { [ Multi_key		]				};
+partial alphanumeric_keys
+	xkb_symbols "crd" {
+	include "us(crd)"
 };