Merge remote-tracking branch 'origin/released'

* origin/released:
  xkbcomp xkeyboard-config libxcb libxtrans fontconfig libX11 libxcb mesa xserver git update 7 Feb 2014

Conflicts:
	mesalib/src/glsl/glcpp/glcpp.c
	openssl/Makefile

29 files changed, 241 insertions, 178 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/Makefile.am b/xorg-server/xkeyboard-config/symbols/Makefile.am
index 509a549cd..77ec0ff0e 100644
--- a/xorg-server/xkeyboard-config/symbols/Makefile.am
+++ b/xorg-server/xkeyboard-config/symbols/Makefile.am
@@ -11,7 +11,7 @@ bt bw by \
 ca cd ch \
 cm cn cz \
 de dk \
-ee es et epo \
+ee es et epo eu \
 fi fo fr \
 gb ge gh gn \
 gr hr hu \
diff --git a/xorg-server/xkeyboard-config/symbols/af b/xorg-server/xkeyboard-config/symbols/af
index b93019a95..67f07c862 100644
--- a/xorg-server/xkeyboard-config/symbols/af
+++ b/xorg-server/xkeyboard-config/symbols/af
@@ -26,7 +26,7 @@ xkb_symbols "basic" {
    key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
    key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
    key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
-   key <AE12> { [ plus, equal ] };
+   key <AE12> { [ equal, plus ] };
 
    key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
    key <AD02> { [ Arabic_sad, Arabic_dammatan ] };
@@ -97,7 +97,7 @@ xkb_symbols "ps" {
    key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
    key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
    key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
-   key <AE12> { [ plus, equal ] };
+   key <AE12> { [ equal, plus ] };
 
    key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
    key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
@@ -168,7 +168,7 @@ xkb_symbols "uz" {
    key <AE09> { [ 0x10006f9, 0x1000029, 0x100200e ] };
    key <AE10> { [ 0x10006f0, 0x1000028, 0x100200f ] };
    key <AE11> { [ minus, Arabic_tatweel, 0x100005f ] };
-   key <AE12> { [ plus, equal ] };
+   key <AE12> { [ equal, plus ] };
 
    key <AD01> { [ Arabic_dad, Arabic_sukun, 0x10000b0 ] };
    key <AD02> { [ Arabic_sad, Arabic_dammatan, 0x1000653 ] };
@@ -229,7 +229,7 @@ xkb_symbols "olpc-ps" {
    key <AE09> { [ 0x10006F9, parenright, enfilledcircbullet ] }; // Arabic nine
    key <AE10> { [ 0x10006F0, parenleft, degree ] }; // Arabic zero
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
-   key <AE12> { [ plus, equal, division ] };
+   key <AE12> { [ equal, plus, division ] };
 
    key <AD01> { [ 0x1000636, 0x1000652, EuroSign ] }; // Arabic dad, Arabic sukun
    key <AD02> { [ 0x1000635, 0x100064C, 0x1000671 ] }; // Arabic sad, Arabic dammatan, Arabic alef walsa
@@ -290,7 +290,7 @@ xkb_symbols "fa-olpc" {
    key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
    key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
-   key <AE12> { [ plus, equal ] };
+   key <AE12> { [ equal, plus ] };
 
    key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
    key <AD02> { [ 0x1000635, 0x100064C ] }; // Arabic sad, Arabic dammatan
@@ -351,7 +351,7 @@ xkb_symbols "uz-olpc" {
    key <AE09> { [ 0x10006F9, parenright, 0x100200E ] }; // Arabic nine, left-to-right mark
    key <AE10> { [ 0x10006F0, parenleft, 0x100200F ] }; // Arabic zero, right-to-left mark
    key <AE11> { [ minus, 0x1000640, underscore ] }; // Arabic_tatweel
-   key <AE12> { [ plus, equal ] };
+   key <AE12> { [ equal, plus ] };
 
    key <AD01> { [ 0x1000636, 0x1000652, degree ] }; // Arabic dad, Arabic sukun
    key <AD02> { [ 0x1000635, 0x100064C, 0x1000653 ] }; // Arabic sad, Arabic dammatan, Arabic maddah above
diff --git a/xorg-server/xkeyboard-config/symbols/ba b/xorg-server/xkeyboard-config/symbols/ba
index 0cc4988d4..63331b858 100644
--- a/xorg-server/xkeyboard-config/symbols/ba
+++ b/xorg-server/xkeyboard-config/symbols/ba
@@ -1,40 +1,34 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Bosnian";
-
     include "rs(latin)"
+    name[Group1]="Bosnian";
 };
 
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
-
     include "rs(latinyz)"
+    name[Group1]= "Bosnian (US keyboard with Bosnian letters)";
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Bosnian (use guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
+    name[Group1]= "Bosnian (with guillemets for quotes)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicode" {
 
-    name[Group1]= "Bosnian (use Bosnian digraphs)";
-
     include "rs(latinunicode)"
+    name[Group1]= "Bosnian (with Bosnian digraphs)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicodeus" {
 
-    name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
-
     include "rs(latinunicodeyz)"
+    name[Group1]= "Bosnian (US keyboard with Bosnian digraphs)";
 };
diff --git a/xorg-server/xkeyboard-config/symbols/ca b/xorg-server/xkeyboard-config/symbols/ca
index abfbbd9f7..2ba48b480 100644
--- a/xorg-server/xkeyboard-config/symbols/ca
+++ b/xorg-server/xkeyboard-config/symbols/ca
@@ -122,10 +122,10 @@ xkb_symbols "fr-dvorak" {
 partial
 xkb_symbols "fr-legacy" {
 
-    name[Group1] = "French (Canada, legacy)";
-
     include "ca(fr)"
 
+    name[Group1] = "French (Canada, legacy)";
+
     key <TLDE>	{ [    degree,     degree,       notsign ]	};
     key <AE01>	{ [         1,     exclam,   onesuperior ]	};
 
@@ -168,10 +168,10 @@ xkb_symbols "fr-legacy" {
 partial
 xkb_symbols "multi" {
 
-    name[Group1] = "Canadian Multilingual (first part)";
-
     include "ca(fr)"
 
+    name[Group1] = "Canadian Multilingual (first part)";
+
     key <TLDE>	{ [     slash,  backslash,           bar ]	};
     key <AE01>	{ [         1,     exclam ]	};
     key <AE02>	{ [         2,         at ]	};
@@ -259,7 +259,6 @@ xkb_symbols "multi-2gr" {
     key <AB08>	{ [ Greek_horizbar, multiply ]	};
     key <AB09>	{ [ periodcentered, division ]	};
     key <AB10>	{ [ NoSymbol, dead_abovedot ]	};
-
 };
 
 // based on
@@ -466,8 +465,8 @@ xkb_symbols "olpc" {
 
 partial alphanumeric_keys
 xkb_symbols "eng" {
-    name[Group1] = "English (Canada)";
     include "us(basic)"
+    name[Group1] = "English (Canada)";
 };
 
 // EXTRAS:
diff --git a/xorg-server/xkeyboard-config/symbols/cm b/xorg-server/xkeyboard-config/symbols/cm
index 6404c97aa..6b7a51854 100644
--- a/xorg-server/xkeyboard-config/symbols/cm
+++ b/xorg-server/xkeyboard-config/symbols/cm
@@ -96,8 +96,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "french"
 {
-	name[Group1]="French (Cameroon)";
 	include "latin"
+	name[Group1]="French (Cameroon)";
 
 	key <AE01> { [ ampersand, 1, onesuperior, exclamdown ] };
 	key <AE02> { [ eacute, 2, asciitilde, oneeighth ] };
@@ -133,13 +133,11 @@ xkb_symbols "french"
 	include "level3(ralt_switch)"
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "azerty"
 {
-	name[Group1] = "Cameroon Multilingual (azerty)";
-	include "level3(ralt_switch)"
 	include "cm(basic)"
+	name[Group1] = "Cameroon Multilingual (azerty)";
 	key <AB01> { [ w, W, U1E85, U1E84 ] };	//  SMALL LETTER W,  CAPITAL LETTER W, SMALL LETTER W WITH DIAERESIS, CAPITAL LETTER W WITH DIAERESIS
 	key <AB02> { [ x, X, U2039, U203A ] };	// SMALL LETTER X, CAPITAL LETTER X, SINGLE LEFT-POINTING ANGLE QUOTATION MARK, SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
 	key <AB03> { [ c, C, U0327, copyright ] };	// SMALL LETTER C, CAPITAL LETTER C, COMBINING CEDILLA, COPYRIGHT SIGN
@@ -189,14 +187,14 @@ xkb_symbols "azerty"
 	key <LSGT> { [ U003C, U003E, U00AB, U00BB ] };	// LESS THAN, GREATER THAN, LEFT GUILLEMET, RIGHT GUILLEMET
 	key <TLDE> { [ U0024, U20AC, U00B2, U00B3 ] };	// DOLLAR, EURO, SUPERSCRIPT 2, SUPERSCRIPT 3
 	include "cm(exclamation_switch)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "qwerty"
 {
-	name[Group1] = "Cameroon Multilingual (qwerty)";
-	include "level3(ralt_switch)"
 	include "cm(basic)"
+	name[Group1] = "Cameroon Multilingual (qwerty)";
 	key <AB01> { [ z, Z, U2026, U2020 ] };	// SMALL LETTER Z, CAPITAL LETTER Z, ELLIPSIS, DAGGER
 	key <AB02> { [ x, X ] };	// SMALL LETTER X, CAPITAL LETTER X
 	key <AB03> { [ c, C, U0327, U00A9 ] };	// SMALL LETTER C, CAPITAL LETTER C, CEDILLA, COPYRIGHT
@@ -242,15 +240,14 @@ xkb_symbols "qwerty"
 	key <BKSL> { [ U005C, U007C ] };	// BACKSLASH, BAR
 	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
 	include "cm(semicolon_switch)"
+	include "level3(ralt_switch)"
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "dvorak"
 {
-	name[Group1] = "Cameroon Multilingual (Dvorak)";
-	include "level3(ralt_switch)"
 	include "us(dvorak)"
+	name[Group1] = "Cameroon Multilingual (Dvorak)";
 	key <AB01> { [ semicolon, colon ] };	// SEMICOLON, COLON
 	key <AB02> { [ q, Q, U2014, U2013 ] };	// SMALL LETTER Q, CAPITAL LETTER Q, EM DASH, EN DASH
 	key <AB03> { [ j, J, U0330, U0323 ] };	// SMALL LETTER J, CAPITAL LETTER J, COMBINING TILDE (NASAL) BELOW, COMBINING DOT BELOW
@@ -299,6 +296,7 @@ xkb_symbols "dvorak"
 	key <BKSL> { [ backslash, bar ] };	// BACKSLASH, BAR
 	key <TLDE> { [ U030D, U0303, U0060, U007E ] };	// COMBINING VERTICAL LINE ABOVE, COMBINING TILDE ABOVE, GRAVE ACCENT, TILDE
 	include "cm(semicolon_switch_dvorak)"
+	include "level3(ralt_switch)"
 };
 
 // The following code creates the "Cameroon key" phenomenon.
diff --git a/xorg-server/xkeyboard-config/symbols/de b/xorg-server/xkeyboard-config/symbols/de
index a497d7f48..150c081c9 100644
--- a/xorg-server/xkeyboard-config/symbols/de
+++ b/xorg-server/xkeyboard-config/symbols/de
@@ -526,10 +526,8 @@ xkb_symbols "mac_nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "dsb"
 {
-	name[Group1] = "Lower Sorbian";
 	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	name[Group1] = "Lower Sorbian";
 	key <AB01> { [              z,              Z,         zcaron,         Zcaron ] };
 	key <AB02> { [              x,              X,         zacute,         Zacute ] };
 	key <AB03> { [              c,              C,         cacute,         Cacute ] };
@@ -544,15 +542,15 @@ xkb_symbols "dsb"
 	key <AD04> { [              r,              R,         racute,         Racute ] };
 	key <AD05> { [              t,              T,          U20B5,       EuroSign ] };
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
 xkb_symbols "dsb_qwertz"
 {
-	name[Group1] = "Lower Sorbian (qwertz)";
 	include "latin(basic)"
-	include "level3(ralt_switch)"
-	include "kpdl(comma)"
+	name[Group1] = "Lower Sorbian (qwertz)";
 	key <AB01> { [              y,              Y                                 ] };
 	key <AB02> { [              x,              X                                 ] };
 	key <AB03> { [              c,              C,         cacute,         Cacute ] };
@@ -569,6 +567,8 @@ xkb_symbols "dsb_qwertz"
 	key <AD06> { [              z,              Z,         zcaron,         Zcaron ] };
 	key <AD07> { [              u,              U,         zacute,         Zacute ] };
 	key <AD09> { [              o,              O,         oacute,         Oacute ] };
+	include "kpdl(comma)"
+	include "level3(ralt_switch)"
 };
 
 partial alphanumeric_keys
@@ -681,6 +681,24 @@ xkb_symbols "htcdream" {
         include "level3(alt_switch)"
 };
 
+partial alphanumeric_keys
+xkb_symbols "tr" {
+
+    // add turkish-specific letters to the basic German layout.
+    // Turkish symbols are accessible with combination of <AltGr> and
+    // 'i', 's', 'g', 'c'' (+<Shift> for capital letters).
+
+    include "de(basic)"
+
+    name[Group1]="Turkish (Germany)";
+
+    key <AD08>  { [    i,      I,      U0131,  U0130   ] };
+    key <AC02>  { [    s,      S,      U015F,  U015E   ] };
+    key <AC05>  { [    g,      G,      U011F,  U011E   ] };
+    key <AB03>  { [    c,      C,      U0E7,   U0C7    ] };
+
+};
+
 // EXTRAS:
 
 partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/dk b/xorg-server/xkeyboard-config/symbols/dk
index 838478bf8..509802753 100644
--- a/xorg-server/xkeyboard-config/symbols/dk
+++ b/xorg-server/xkeyboard-config/symbols/dk
@@ -42,6 +42,14 @@ xkb_symbols "nodeadkeys" {
 
 };
 
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+    include "dk(basic)"
+    name[Group1] = "Danish (Winkeys)";
+    include "eurosign(5)"
+};
+
 // Copied from macintosh_vndr/dk
 partial alphanumeric_keys
 xkb_symbols "mac" {
diff --git a/xorg-server/xkeyboard-config/symbols/es b/xorg-server/xkeyboard-config/symbols/es
index 9e963a23f..749a86d71 100644
--- a/xorg-server/xkeyboard-config/symbols/es
+++ b/xorg-server/xkeyboard-config/symbols/es
@@ -26,6 +26,14 @@ xkb_symbols "basic" {
     include "level3(ralt_switch)"
 };
 
+partial alphanumeric
+xkb_symbols "winkeys" {
+
+    include "es(basic)"
+    name[Group1]="Spanish (Winkeys)";
+    include "eurosign(5)"
+};
+
 partial alphanumeric_keys
 xkb_symbols "Sundeadkeys" {
 
diff --git a/xorg-server/xkeyboard-config/symbols/eu b/xorg-server/xkeyboard-config/symbols/eu
new file mode 100644
index 000000000..0a4d31a21
--- /dev/null
+++ b/xorg-server/xkeyboard-config/symbols/eu
@@ -0,0 +1,63 @@
+// Based on <http://eurkey.steffen.bruentjen.eu/>
+// Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot bruentjen dot de)
+// License: GPLv3 <http://www.gnu.org/licenses/gpl-3.0.html>
+// modified by Christoph Roeper <spam (at) roeper dot biz> (use firstName to mail)
+
+default  partial alphanumeric_keys modifier_keys 
+xkb_symbols "basic"  {
+
+        include "us(basic)"
+ 
+        name[Group1] = "EurKEY (US based layout with european letters)";
+
+        key <AB01> { [              z,                 Z,               agrave,               Agrave ] };
+        key <AB02> { [              x,                 X,               aacute,               Aacute ] };
+        key <AB03> { [              c,                 C,             ccedilla,             Ccedilla ] };
+        key <AB04> { [              v,                 V,               igrave,               Igrave ] };
+        key <AB05> { [              b,                 B,               iacute,               Iacute ] };
+        key <AB06> { [              n,                 N,               ntilde,               Ntilde ] };
+        key <AB07> { [              m,                 M,            Multi_key,            Multi_key ] };
+        key <AB08> { [          comma,              less,               ograve,               Ograve ] };
+        key <AB09> { [         period,           greater,               oacute,               Oacute ] };
+        key <AB10> { [          slash,          question,         questiondown,            0x1002026 ] };
+        key <AC01> { [              a,                 A,           adiaeresis,           Adiaeresis ] };
+        key <AC02> { [              s,                 S,               ssharp,              section ] };
+        key <AC03> { [              d,                 D,                  eth,                  Eth ] };
+        key <AC04> { [              f,                 F,               egrave,               Egrave ] };
+        key <AC05> { [              g,                 G,               eacute,               Eacute ] };
+        key <AC06> { [              h,                 H,               ugrave,               Ugrave ] };
+        key <AC07> { [              j,                 J,               uacute,               Uacute ] };
+        key <AC08> { [              k,                 K,                U0133,                U0132 ] };
+        key <AC09> { [              l,                 L,               oslash,               Oslash ] };
+        key <AC10> { [      semicolon,             colon,       dead_diaeresis,       periodcentered ] };
+        key <AC11> { [     apostrophe,          quotedbl,           dead_acute,                dagger] };
+        key <AD01> { [              q,                 Q,                   ae,                   AE ] };
+        key <AD02> { [              w,                 W,                aring,                Aring ] };
+        key <AD03> { [              e,                 E,           ediaeresis,           Ediaeresis ] };
+        key <AD04> { [              r,                 R,               yacute,               Yacute ] };
+        key <AD05> { [              t,                 T,                thorn,                Thorn ] };
+        key <AD06> { [              y,                 Y,           ydiaeresis,           Ydiaeresis ] };
+        key <AD07> { [              u,                 U,           udiaeresis,           Udiaeresis ] };
+        key <AD08> { [              i,                 I,           idiaeresis,           Idiaeresis ] };
+        key <AD09> { [              o,                 O,           odiaeresis,           Odiaeresis ] };
+        key <AD10> { [              p,                 P,                   oe,                   OE ] };
+        key <AD11> { [    bracketleft,         braceleft,        guillemotleft,                U2039 ] };
+        key <AD12> { [   bracketright,        braceright,       guillemotright,                U203A ] };
+        key <AE01> { [              1,            exclam,           exclamdown,          onesuperior ] };
+        key <AE02> { [              2,                at,          ordfeminine,          twosuperior ] };
+        key <AE03> { [              3,        numbersign,            masculine,        threesuperior ] };
+        key <AE04> { [              4,            dollar,             sterling,                  yen ] };
+        key <AE05> { [              5,           percent,             EuroSign,                 cent ] };
+        key <AE06> { [              6,       asciicircum,      dead_circumflex,           dead_caron ] };
+        key <AE07> { [              7,         ampersand,       dead_abovering,          dead_macron ] };
+        key <AE08> { [              8,          asterisk,   doublelowquotemark,   singlelowquotemark ] };
+        key <AE09> { [              9,         parenleft,  leftdoublequotemark,  leftsinglequotemark ] };
+        key <AE10> { [              0,        parenright, rightdoublequotemark, rightsinglequotemark ] };
+        key <AE11> { [          minus,        underscore,            copyright,           numerosign ] };
+        key <AE12> { [          equal,              plus,             multiply,             division ] };
+        key <BKSL> { [      backslash,               bar,              notsign,            brokenbar ] };
+        key <TLDE> { [          grave,        asciitilde,           dead_grave,           dead_tilde ] };
+        key <KPDL> { [      KP_Delete,        KP_Decimal,                comma,                comma ] };
+
+        include "level3(ralt_switch)"
+};
diff --git a/xorg-server/xkeyboard-config/symbols/fi b/xorg-server/xkeyboard-config/symbols/fi
index 4fdcc2a25..1818243dd 100644
--- a/xorg-server/xkeyboard-config/symbols/fi
+++ b/xorg-server/xkeyboard-config/symbols/fi
@@ -83,6 +83,14 @@ xkb_symbols "kotoistus" {
 };
 
 partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+    include "fi(kotoistus)"
+    name[Group1]="Finnish (Winkeys)";
+    include "eurosign(5)"
+};
+
+partial alphanumeric_keys
 xkb_symbols "classic" {
 
     include "fi(fi)"
diff --git a/xorg-server/xkeyboard-config/symbols/fr b/xorg-server/xkeyboard-config/symbols/fr
index 9c89db825..3898b1c57 100644
--- a/xorg-server/xkeyboard-config/symbols/fr
+++ b/xorg-server/xkeyboard-config/symbols/fr
@@ -36,8 +36,6 @@ xkb_symbols "basic" {
     key <AB09>	{ [     colon,      slash, periodcentered,   division ]	};
     key <AB10>	{ [    exclam,    section, dead_belowdot, dead_abovedot ] };
 
-    include "kpdl(comma)"
-
     include "level3(ralt_switch)"
 };
 
diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 1ec0c809a..61fc39221 100644
--- a/xorg-server/xkeyboard-config/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
@@ -1,9 +1,8 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Croatian";
-
     include "rs(latin)"
+    name[Group1]="Croatian";
 
     // Redefine these keys to match XFree86 Croatian layout
     key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };
@@ -16,9 +15,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Croatian (US keyboard with Croatian letters)";
-
     include "us"
+    name[Group1]= "Croatian (US keyboard with Croatian letters)";
 
     key <AD01> { [    any,    any,	backslash	        ] };
     key <AD02> { [    any,    any,	bar      	        ] };
@@ -44,30 +42,25 @@ xkb_symbols "us" {
     key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };
 
     include "level3(ralt_switch)"
-
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Croatian (use guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
+    name[Group1]= "Croatian (with guillemets for quotes)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicode" {
 
-    name[Group1]= "Croatian (use Croatian digraphs)";
-
     include "rs(latinunicode)"
+    name[Group1]= "Croatian (with Croatian digraphs)";
 };
 
 partial alphanumeric_keys
 xkb_symbols "unicodeus" {
 
-    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
-
     include "rs(latinunicodeyz)"
+    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
 };
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index f70e215e6..054671513 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -107,7 +107,7 @@ partial alphanumeric_keys
 xkb_symbols "bolnagri" {
      name[Group1] = "Hindi (Bolnagri)";
      key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
+
     // Roman digits
     key <TLDE>  { [   U0902,	U0901,		apostrophe, 	asciitilde ] }; // apostrophe: anusvara, candrabindu
     key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };
@@ -393,8 +393,6 @@ xkb_symbols "ben_baishakhi" {
 //   modifier_map Shift  { Shift_L };
 //   modifier_map Lock   { Caps_Lock };
 //   modifier_map Control{ Control_L };
-
-
 };
 
 xkb_symbols "ben_inscript" {
@@ -536,8 +534,6 @@ xkb_symbols "ben_gitanjali" {
 //   modifier_map Shift  { Shift_L };
 //   modifier_map Lock   { Caps_Lock };
 //   modifier_map Control{ Control_L };
-
-
 };
 
 
@@ -613,7 +609,6 @@ xkb_symbols "ben_bornona" {
 //   modifier_map Control{ Control_L };
 // third level with right-alt
     include "level3(ralt_switch)"
-
 };
 
 partial alphanumeric_keys
@@ -842,7 +837,6 @@ xkb_symbols "mal" {
 
     include "rupeesign(4)"
     include "level3(ralt_switch)"
-
 };
 
 //Name		:	Lalitha
@@ -854,7 +848,7 @@ partial alphanumeric_keys
 xkb_symbols "mal_lalitha" {
      name[Group1] = "Malayalam (Lalitha)";
      key.type="FOUR_LEVEL";
-    //Top Alphanumeric row
+
     // Roman digits
     key <TLDE>  { [   U0D4D,	U0D02,		apostrophe, 	asciitilde ] }; // apostrophe: virama(chandrakala),anusvara
     key <AE01>  { [   1,	exclam,	U0D67,		exclam	   ] };
@@ -1237,7 +1231,6 @@ xkb_symbols "tam_TSCII" {
     key <AB07> { [ 0x10000ab, 0x10000ac ] }; // a, A
     key <AB08> { [ 0x10000fe, 0x10000ae ] }; // i, I
 
-};
 
 partial alphanumeric_keys
 xkb_symbols "tam_TAB" {
@@ -1462,7 +1455,7 @@ partial alphanumeric_keys
 xkb_symbols "jhelum" {
       name[Group1] = "Punjabi (Gurmukhi Jhelum)";
           key.type="FOUR_LEVEL";
-     //Top Alphanumeric row
+
      // Roman digits
      key <TLDE>  { [  apostrophe, asciitilde, U0A02,U0A01 ] }; // apostrophe: anusvara, candrabindu
      key <AE01>  { [   1,exclam,	U0A67,	exclam	   ] };
@@ -1660,12 +1653,10 @@ xkb_symbols "hin-wx" {
 partial alphanumeric_keys
 xkb_symbols "eng" {
 
-    name[Group1]= "English (India, with RupeeSign)";
-
     include "us(basic)"
+    name[Group1]= "English (India, with rupee sign)";
 
     include "rupeesign(4)"
-
     include "level3(ralt_switch)"
 };
 
@@ -1681,7 +1672,7 @@ xkb_symbols "eng" {
 partial alphanumeric_keys
 xkb_symbols "mal_enhanced" {
 
-    name[Group1] = "Malayalam (enhanced Inscript with Rupee Sign)";
+    name[Group1] = "Malayalam (enhanced Inscript, with rupee sign)";
 
    //From grave to backslash (\)
 
@@ -1744,11 +1735,8 @@ xkb_symbols "mal_enhanced" {
     key <AB09> { [ period , U0d7d ] }; //chillu l
     key <AB10> { [ U0d2f , question ] };
 
-    // hope this includes the rupee sign at alt + 4
-
     include "rupeesign(4)"
     include "level3(ralt_switch)"
-
 };
 
 
@@ -1780,13 +1768,12 @@ xkb_symbols "hin-kagapa" {
      name[Group1] = "Hindi (KaGaPa phonetic)";
      key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0967          ] };
     key <AE02>  { [   2,            at,           U0968,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
     key <AE03>  { [   3,            numbersign,   U0969          ] };
-    key <AE04>  { [   4,            dollar,       U096A,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE04>  { [   4,            dollar,       U096A,  U20B9  ] };  // U20B9: new Indian rupee sign
     key <AE05>  { [   5,            percent,      U096B          ] };
     key <AE06>  { [   6,            asciicircum,  U096C,  U200C  ] };  // ZWNJ
     key <AE07>  { [   7,            ampersand,    U096D,  U200D  ] };  // ZWJ
@@ -1824,7 +1811,6 @@ xkb_symbols "hin-kagapa" {
     key <AC10>  { [   semicolon,    colon,     U1CF2,    U1CF3   ] };  // U1CF2/3: ardhavisarga/rotated ardhavisarga
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U091E,   U0919                   ] };  // Z: nya, nga
     key <AB02>  { [   U0937,   U093C,  U0934           ] };  // X: ssa, nukta below, lla-nukta
@@ -1844,17 +1830,15 @@ xkb_symbols "hin-kagapa" {
 // Sanskrit uses Devanagari layout of Hindi
 partial alphanumeric_keys
 xkb_symbols "san-kagapa" {
-  name[Group1] = "Sanskrit (KaGaPa phonetic)";
   include "in(hin-kagapa)"
-
+  name[Group1] = "Sanskrit (KaGaPa phonetic)";
 };
 
 // Marathi uses Devanagari layout of Hindi
 partial alphanumeric_keys
 xkb_symbols "mar-kagapa" {
-  name[Group1] = "Marathi (KaGaPa phonetic)";
   include "in(hin-kagapa)"
-
+  name[Group1] = "Marathi (KaGaPa phonetic)";
 };
 
 
@@ -1875,13 +1859,12 @@ xkb_symbols "kan-kagapa" {
     name[Group1] = "Kannada (KaGaPa phonetic)";
     key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0CE7          ] };
     key <AE02>  { [   2,            at,           U0CE8,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
     key <AE03>  { [   3,            numbersign,   U0CE9          ] };
-    key <AE04>  { [   4,            dollar,       U0CEA,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE04>  { [   4,            dollar,       U0CEA,  U20B9  ] };  // U20B9: new Indian rupee sign
     key <AE05>  { [   5,            percent,      U0CEB          ] };
     key <AE06>  { [   6,            asciicircum,  U0CEC,  U200C  ] };  // ZWNJ
     key <AE07>  { [   7,            ampersand,    U0CED,  U200D  ] };  // ZWJ
@@ -1919,7 +1902,6 @@ xkb_symbols "kan-kagapa" {
     key <AC10>  { [   semicolon,    colon                        ] };
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U0C9E,   U0C99                   ] };  // Z: nya, nga
     key <AB02>  { [   U0CB7,   U0CBC,  U0CDE           ] };  // X: ssa, nukta below, LLLA
@@ -1954,13 +1936,12 @@ xkb_symbols "tel-kagapa" {
     name[Group1] = "Telugu (KaGaPa phonetic)";
     key.type="FOUR_LEVEL";
 
-    //Top Alphanumeric row
     // Roman digits
     key <TLDE>  { [   apostrophe,   asciitilde,   U201C          ] };  // U201C: left double quotation mark
     key <AE01>  { [   1,            exclam,       U0C67          ] };
     key <AE02>  { [   2,            at,           U0C68,  U20A8  ] };  // U20A8: generic rupee sign (Rs)
     key <AE03>  { [   3,            numbersign,   U0C69          ] };
-    key <AE04>  { [   4,            dollar,       U0C6A,  U20B9  ] };  // U20B9: new Indian Rupee sign
+    key <AE04>  { [   4,            dollar,       U0C6A,  U20B9  ] };  // U20B9: new Indian rupee sign
     key <AE05>  { [   5,            percent,      U0C6B          ] };
     key <AE06>  { [   6,            asciicircum,  U0C6C,  U200C  ] };  // ZWNJ
     key <AE07>  { [   7,            ampersand,    U0C6D,  U200D  ] };  // ZWJ
@@ -1998,7 +1979,6 @@ xkb_symbols "tel-kagapa" {
     key <AC10>  { [   semicolon,    colon                        ] };
     key <AC11>  { [   apostrophe,   quotedbl,  U0951,    U201D   ] };  // U0951: Devanagari stress sign udatta
                                                                        // U201D: Right double quotation mark
-
     //Z Row
     key <AB01>  { [   U0C1E,   U0C19                   ] };  // Z: nya, nga
     key <AB02>  { [   U0C37                            ] };  // X: ssa
@@ -2026,7 +2006,6 @@ xkb_symbols "eeyek" {
 
     name[Group1]= "Manipuri (Eeyek)";
 
-    // Alphanumeric section
     key <TLDE> {	[     grave,	asciitilde	]	};
     key <AE01> {	[	  Uabf1,	exclam 		]	};
     key <AE02> {	[	  Uabf2,	at		]	};
@@ -2078,7 +2057,6 @@ xkb_symbols "eeyek" {
     key <AB10> {	[     slash,	question	]	};
 
     key <BKSL> {	[ backslash,         bar	]	};
-    // End alphanumeric section
     
     include "level3(ralt_switch)"
 };
diff --git a/xorg-server/xkeyboard-config/symbols/inet b/xorg-server/xkeyboard-config/symbols/inet
index fe21f1ed7..f7ccc6f81 100644
--- a/xorg-server/xkeyboard-config/symbols/inet
+++ b/xorg-server/xkeyboard-config/symbols/inet
@@ -256,7 +256,7 @@ xkb_symbols "acer_c300" {
     key <I30>   {       [ XF86AudioRaiseVolume  ]       };
     key <I5E>   {       [ XF86Launch2           ]       };
     key <I75>   {       [ Help                  ]       };
-    key <XFER>  {       [ XF86Launch1           ]       };
+    key <IR7C>  {       [ XF86Launch1           ]       };
 };
 
 // Acer Ferrari 4000 Keyboard
@@ -461,7 +461,7 @@ xkb_symbols "cherryblue" {
     key <I26>	{	[ XF86AudioMute		]	};
     key <I63>	{	[ XF86Standby		]	};
     key <PRSC>	{	[ XF86Terminal		]	};
-    key <XFER>	{	[ XF86Go		]	};
+    key <IR7C>	{	[ XF86Go		]	};
 };
 
 // Cherry CyMotion Master XPress
@@ -488,7 +488,7 @@ xkb_symbols "cherryblueb" {
     key <I71>   {       [ XF86Book              ]       };
     key <I72>   {       [ XF86Book              ]       };
     key <PRSC>  {       [ XF86Terminal          ]       };
-    key <XFER>  {       [ XF86Go                ]       };
+    key <IR7C>  {       [ XF86Go                ]       };
 };
 
 // Cherry Blue Line CyBo@rd (alternate option)
@@ -505,7 +505,7 @@ xkb_symbols "cherrycyboard" {
     key <FK17>    {   [ XF86Search        ]   };
     key <I02> {   [ XF86HomePage      ]   };
     key <K67> {   [ XF86Terminal      ]   };
-    key <XFER>    {   [ XF86AudioMedia    ]   };
+    key <IR7C>    {   [ XF86AudioMedia    ]   };
 };
 
 // Cherry CyMotion Expert
@@ -695,8 +695,8 @@ xkb_symbols "inspiron" {
     key <I04>   {       [ XF86AudioNext         ]       };
     key <I21>   {       [ XF86Eject             ]       };
     key <I56>   {       [ XF86Display           ]       };
-    key <NFER>  {       [ XF86AudioPrev         ]       };
-    key <XFER>  {       [ XF86AudioPlay, XF86AudioPause ] };
+    key <IR7D>  {       [ XF86AudioPrev         ]       };
+    key <IR7C>  {       [ XF86AudioPlay, XF86AudioPause ] };
 };
 
 // DELL USB Multimedia Keyboard (former 8135, generalized, superset of 8125)
@@ -707,7 +707,7 @@ xkb_symbols "dellusbmm" {
     include "inet(media_nav_acpi_common)"
     key <I02>	{	[ XF86HomePage		]	};
     key <K67>	{	[ XF86MyComputer	]	};
-    key <XFER>	{	[ XF86AudioMedia	]	};
+    key <IR7C>	{	[ XF86AudioMedia	]	};
 };
 
 
@@ -727,7 +727,7 @@ xkb_symbols "diamond" {
 partial alphanumeric_keys
 xkb_symbols "ennyah_dkb1008" {
     include "inet(media_nav_acpi_common)"
-    key <XFER>  {	[ XF86AudioMedia	]	};
+    key <IR7C>  {	[ XF86AudioMedia	]	};
 };
 
 
@@ -1033,7 +1033,7 @@ xkb_symbols "logitech_set3" {
     key <I55>   {       [ XF86Save              ]       };      // F8
     key <I56>   {       [ XF86Documents         ]       };      // F10
     key <I69>   {       [ XF86Go                ]       };
-    key <XFER>  {       [ XF86AudioMedia        ]       };
+    key <IR7C>  {       [ XF86AudioMedia        ]       };
 };
 
 // Logitech Access Keyboard
@@ -1170,7 +1170,7 @@ xkb_symbols "logidinovo" {
     key <I21>	{	[ XF86AudioRaiseVolume	]	};
     key <K66>	{	[ XF86AudioLowerVolume	]	};
     key <KPDC>	{	[ XF86AudioMute		]	};
-    key <XFER>	{	[ XF86AudioMedia	]	};
+    key <IR7C>	{	[ XF86AudioMedia	]	};
 };
 
 partial alphanumeric_keys
@@ -1179,7 +1179,7 @@ xkb_symbols "logidinovoedge" {
     key <I02>	{	[ XF86HomePage		]	};
     key <I6C>	{	[ XF86Mail		]	};
     key <FK17>  {       [ XF86Search            ]       };
-    key <XFER>	{	[ XF86AudioMedia	]	};
+    key <IR7C>	{	[ XF86AudioMedia	]	};
 };
 
 partial alphanumeric_keys
@@ -1218,8 +1218,8 @@ xkb_symbols "logitech_g15" {
     key  <K74> {         [         XF86WWW ] };
     key  <K75> {         [     XF86LaunchE ] };
     key <II5D> {         [     XF86Launch1 ] };
-    key <NFER> {         [     XF86Launch2 ] };
-    key <XFER> {         [     XF86Launch8 ] };
+    key <IR7D> {         [     XF86Launch2 ] };
+    key <IR7C> {         [     XF86Launch8 ] };
 };
 
 
@@ -1364,7 +1364,7 @@ xkb_symbols "microsoftprose" {
     key <I63>	{	[ XF86Standby		]	};
     key <I68>	{	[ XF86AudioStop		]	};
     key <PRSC>	{	[ XF86MyComputer	]	};
-    key <XFER>	{	[ XF86AudioMedia	]	};
+    key <IR7C>	{	[ XF86AudioMedia	]	};
 };
 
 // Microsoft Office Keyboard
@@ -1511,7 +1511,7 @@ xkb_symbols "samsung4500" {
     key <I18>	{	[ XF86Eject		]	};
     key <I26>	{	[ Help			]	};
     key <I59>	{	[ XF86Explorer		]	};
-    key <NFER>	{	[ XF86Launch2		]	};
+    key <IR7D>	{	[ XF86Launch2		]	};
 };
 
 // Samsung SDM 4510P
@@ -1521,7 +1521,7 @@ xkb_symbols "samsung4510" {
     key <I02>	{	[ XF86Launch1		]	};
     key <I04>	{	[ XF86Launch3		]	};
     key <I18>	{	[ XF86Eject		]	};
-    key <NFER>	{	[ XF86Launch2		]	};
+    key <IR7D>	{	[ XF86Launch2		]	};
 };
 
 
@@ -1748,7 +1748,7 @@ xkb_symbols "cymotionlinux" {
     key <I78>	{	[	XF86Copy		]	};
     key <K65>	{	[	XF86Paste		]	};
     key <K75>	{	[	XF86ScrollUp		]	};
-    key <XFER>	{	[	XF86AudioMedia		]	};
+    key <IR7C>	{	[	XF86AudioMedia		]	};
 };
 
 partial alphanumeric_keys
diff --git a/xorg-server/xkeyboard-config/symbols/ir b/xorg-server/xkeyboard-config/symbols/ir
index 983bf60d9..1be5e7a22 100644
--- a/xorg-server/xkeyboard-config/symbols/ir
+++ b/xorg-server/xkeyboard-config/symbols/ir
@@ -26,7 +26,7 @@ xkb_symbols "pes" {
 
 partial alphanumeric_keys
 xkb_symbols "pes_keypad" {
-    name[Group1]= "Persian (with Persian Keypad)";
+    name[Group1]= "Persian (with Persian keypad)";
 
     include "ir(pes_part_basic)"
     include "ir(pes_part_keypad)"
diff --git a/xorg-server/xkeyboard-config/symbols/is b/xorg-server/xkeyboard-config/symbols/is
index 34d6bed33..93af3f803 100644
--- a/xorg-server/xkeyboard-config/symbols/is
+++ b/xorg-server/xkeyboard-config/symbols/is
@@ -193,11 +193,12 @@ xkb_symbols "mac" {
 // Icelandic Dvorak
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    name[Group1]= "Icelandic (Dvorak)";
 
     include "us(dvorak)"
     include "eurosign(4)"
 
+    name[Group1]= "Icelandic (Dvorak)";
+
     key <AD11> { [      slash,  question,    U201e,   U201c   ] };
     key <AC06> { [       d,     D,           eth,     ETH     ] };
     key <AC10> { [       s,     S,           ae,      AE      ] };
diff --git a/xorg-server/xkeyboard-config/symbols/it b/xorg-server/xkeyboard-config/symbols/it
index 8a66a306a..8dd4365de 100644
--- a/xorg-server/xkeyboard-config/symbols/it
+++ b/xorg-server/xkeyboard-config/symbols/it
@@ -33,8 +33,6 @@ xkb_symbols "basic" {
 
     key <LSGT>	{ [      less,    greater,guillemotleft,guillemotright] };
 
-    include "kpdl(comma)"
-
     include "level3(ralt_switch)"
 };
 
@@ -63,6 +61,14 @@ xkb_symbols "nodeadkeys" {
     key <BKSL>	{ [    ugrave,    section,        grave,        breve ]	};
 };
 
+partial alphanueric_keys
+xkb_symbols "winkeys" {
+
+   include "it(basic)"
+   name[Group1]="Italian (Winkeys)";
+   include "eurosign(5)"
+};
+
 // Copied from macintosh_vndr/it
 partial alphanumeric_keys
 xkb_symbols "mac" {
diff --git a/xorg-server/xkeyboard-config/symbols/jp b/xorg-server/xkeyboard-config/symbols/jp
index 52f574623..f0b2c4d75 100644
--- a/xorg-server/xkeyboard-config/symbols/jp
+++ b/xorg-server/xkeyboard-config/symbols/jp
@@ -243,8 +243,8 @@ xkb_symbols "nicola_f_bs" {
 // Copied from macintosh_vndr/jp
 partial alphanumeric_keys
 xkb_symbols "mac" {
-    name[Group1]= "Japanese (Macintosh)";
     include "jp(kana)"
+    name[Group1]= "Japanese (Macintosh)";
 
     replace key <CAPS> { [ Caps_Lock ] };
 };
@@ -256,8 +256,8 @@ xkb_symbols "hztg_escape" {
 
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
-    name[Group1]= "Japanese (Dvorak)";
     include "jp(OADG109A)"
+    name[Group1]= "Japanese (Dvorak)";
 
     key <AE11> { [ at, grave		] };
 
diff --git a/xorg-server/xkeyboard-config/symbols/ma b/xorg-server/xkeyboard-config/symbols/ma
index 2d128837e..db7b5bb38 100644
--- a/xorg-server/xkeyboard-config/symbols/ma
+++ b/xorg-server/xkeyboard-config/symbols/ma
@@ -82,9 +82,9 @@ xkb_symbols "tifinagh" {
 
 partial alphanumeric_keys
 xkb_symbols "tifinagh-phonetic" {
+    include "ma(tifinagh)"
 
     name[Group1]="Berber (Morocco, Tifinagh phonetic)";
-    include "ma(tifinagh)"
 
     key <LatA>	{ [ 0x1002d30 ]	};
     key <LatZ>	{ [ 0x1002d63, 0x1002d65 ]	};
diff --git a/xorg-server/xkeyboard-config/symbols/nl b/xorg-server/xkeyboard-config/symbols/nl
index 1dde405f8..76cb0183e 100644
--- a/xorg-server/xkeyboard-config/symbols/nl
+++ b/xorg-server/xkeyboard-config/symbols/nl
@@ -49,8 +49,6 @@ xkb_symbols "basic" {
 
     key <LSGT>	{ [bracketright, bracketleft,       bar,    brokenbar ]	};
 
-    include "kpdl(comma)"
-
     include "level3(ralt_switch)"
 };
 
diff --git a/xorg-server/xkeyboard-config/symbols/no b/xorg-server/xkeyboard-config/symbols/no
index 5609de06e..fe79d9ba4 100644
--- a/xorg-server/xkeyboard-config/symbols/no
+++ b/xorg-server/xkeyboard-config/symbols/no
@@ -52,6 +52,14 @@ xkb_symbols "nodeadkeys" {
     key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
 };
 
+partial alphanumeric_keys
+xkb_symbols "winkeys" {
+
+     include "no(basic)"
+     name[Group1]="Norwegian (Winkeys)";
+     include "eurosign(5)"
+};
+
 // Norwegian Dvorak
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
diff --git a/xorg-server/xkeyboard-config/symbols/rs b/xorg-server/xkeyboard-config/symbols/rs
index 86b54632a..06025e17e 100644
--- a/xorg-server/xkeyboard-config/symbols/rs
+++ b/xorg-server/xkeyboard-config/symbols/rs
@@ -40,12 +40,10 @@ xkb_symbols "latin" {
 
 partial alphanumeric_keys
 xkb_symbols "yz" {
-  // Cyrillic_zhe and Cyrillic_ze swapped.
-
-  name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic, ZE and ZHE swapped)";
+
   key <AD06> {   [ Cyrillic_zhe,        Cyrillic_ZHE,   any,any ]   }; // y
   key <AB01> {   [ Cyrillic_ze,         Cyrillic_ZE,    any,any ]   }; // z
 };
@@ -247,9 +245,10 @@ xkb_symbols "latinunicode" {
   // This mapping supports the Unicode characters 0x1c4-0x1cc (dz, lj, and nj
   // as single character). You get the title form with AltGr+Shift.
 
+  include "rs(latin)"
+
   name[Group1]= "Serbian (Latin Unicode)";
 
-  include "rs(latin)"
   include "rs(twoletter)"
 };
 
@@ -257,10 +256,10 @@ partial alphanumeric_keys
 xkb_symbols "latinyz" {
   // For those who insist on using "english-position" Z and Y.
 
-  name[Group1]= "Serbian (Latin qwerty)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin qwerty)";
+
   key <AD06> {   [ y,                   Y,             any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -269,10 +268,10 @@ partial alphanumeric_keys
 xkb_symbols "latinunicodeyz" {
   // Unicode, ZHE and Z swapped.
 
-  name[Group1]= "Serbian (Latin Unicode qwerty)";
-
   include "rs(latinunicode)"
 
+  name[Group1]= "Serbian (Latin Unicode qwerty)";
+
   key <AD06> {   [ zcaron,              Zcaron,        any,any ]   }; // y
   key <AB01> {   [ z,                   Z,             any,any ]   }; // z
 };
@@ -280,10 +279,10 @@ xkb_symbols "latinunicodeyz" {
 xkb_symbols "alternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Cyrillic with guillemets)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (Cyrillic with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -291,10 +290,10 @@ xkb_symbols "alternatequotes" {
 xkb_symbols "latinalternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (Latin with guillemets)";
-
   include "rs(latin)"
 
+  name[Group1]= "Serbian (Latin with guillemets)";
+
   key <AC02> {   [ any,any,     guillemotright, NoSymbol ]   }; // s
   key <AC03> {   [ any,any,     guillemotleft,  NoSymbol ]   }; // d
 };
@@ -306,10 +305,10 @@ xkb_symbols "rue" {
   //   Ljubomir J. Papuga (Любомир Я. Папуґа) <papuga@zoho.com>
   //   Mihajlo Hornjak <smeceiotpad@gmail.com>
 
-  name[Group1]= "Pannonian Rusyn";
-
   include "rs(basic)"
 
+  name[Group1]= "Pannonian Rusyn";
+
   key <TLDE> {   [ Cyrillic_softsign,         Cyrillic_SOFTSIGN         ]   }; // `
 
   key <AD01> {   [ Cyrillic_ya,               Cyrillic_YA               ]   }; // q
@@ -330,10 +329,10 @@ xkb_symbols "combiningkeys" {
   // Raw combining characters instead of dead keys,
   // especially good for post-accenting texts.
 
-  name[Group1]= "Serbian (combining accents instead of dead keys)";
-
   include "rs(basic)"
 
+  name[Group1]= "Serbian (combining accents instead of dead keys)";
+
   key <AE03> {   [ any,any,     U0302, dead_circumflex    ]   }; // 3, U0302 = COMBINING CIRCUMFLEX ACCENT
   key <AE07> {   [ any,any,     U0300, NoSymbol           ]   }; // 7, U0300 = COMBINING GRAVE ACCENT
   key <AE08> {   [ any,any,     U030F, NoSymbol           ]   }; // 8, U030F = COMBINING DOUBLE GRAVE ACCENT
diff --git a/xorg-server/xkeyboard-config/symbols/ru b/xorg-server/xkeyboard-config/symbols/ru
index 043e011e6..782a3d75a 100644
--- a/xorg-server/xkeyboard-config/symbols/ru
+++ b/xorg-server/xkeyboard-config/symbols/ru
@@ -201,7 +201,7 @@ xkb_symbols "phonetic" {
     key	<LatP> {	[     Cyrillic_pe,     Cyrillic_PE	]	};
 
     key	<AD11> {	[    Cyrillic_sha,    Cyrillic_SHA	]	};
-    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};
+    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_SOFTSIGN  ]	};
     key	<AD12> {	[  Cyrillic_shcha,  Cyrillic_SHCHA	]	};
     key	<BKSL> {	[      Cyrillic_e,	Cyrillic_E	]	};
 };
@@ -214,7 +214,7 @@ xkb_symbols "phonetic_winkeys" {
 
     key	<LatX> {	[     Cyrillic_ha,     Cyrillic_HA	]	};
     key	<LatH> {	[     Cyrillic_che,     Cyrillic_CHE	]	};
-    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_softsign  ]	};
+    key	<AE12> {	[ Cyrillic_softsign, Cyrillic_SOFTSIGN  ]	};
 
 };
 
diff --git a/xorg-server/xkeyboard-config/symbols/se b/xorg-server/xkeyboard-config/symbols/se
index 7c37d2a1d..320a1861d 100644
--- a/xorg-server/xkeyboard-config/symbols/se
+++ b/xorg-server/xkeyboard-config/symbols/se
@@ -48,10 +48,10 @@ xkb_symbols "nodeadkeys" {
 partial alphanumeric_keys
 xkb_symbols "dvorak" {
 
-    name[Group1]="Swedish (Dvorak)";
-
     include "se(basic)"
 
+    name[Group1]="Swedish (Dvorak)";
+
     key <AD01> { [     aring,      Aring,    backslash		     ]	};
     key <AD02> { [  adiaeresis,	Adiaeresis,  braceleft,  bracketleft ]	};
     key <AD03> { [ odiaeresis, Odiaeresis,  braceright, bracketright ]	};
@@ -202,10 +202,10 @@ xkb_symbols "mac" {
 partial alphanumeric_keys
 xkb_symbols "svdvorak" {
 
-   name[Group1]="Swedish (Svdvorak)";
-
    include "se(basic)"
 
+   name[Group1]="Swedish (Svdvorak)";
+
    key <AD01> { [ aring, Aring, braceleft ] };
    key <AD02> { [ comma, semicolon, bracketleft ] };
    key <AD03> { [ period, colon, bracketright ] };
diff --git a/xorg-server/xkeyboard-config/symbols/si b/xorg-server/xkeyboard-config/symbols/si
index cff5f5602..7e214fba8 100644
--- a/xorg-server/xkeyboard-config/symbols/si
+++ b/xorg-server/xkeyboard-config/symbols/si
@@ -1,30 +1,29 @@
 default  partial alphanumeric_keys
 xkb_symbols "basic" {
 
-    name[Group1]="Slovenian";
-
     include "rs(latin)"
 
+    name[Group1]="Slovenian";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
 partial alphanumeric_keys
 xkb_symbols "us" {
 
-    name[Group1]= "Slovenian (US keyboard with Slovenian letters)";
-
     include "rs(latinyz)"
 
+    name[Group1]= "Slovenian (US keyboard with Slovenian letters)";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
 
-
 partial alphanumeric_keys
 xkb_symbols "alternatequotes" {
 
-    name[Group1]= "Slovenian (use guillemets for quotes)";
-
     include "rs(latinalternatequotes)"
 
+    name[Group1]= "Slovenian (with guillemets for quotes)";
+
     key <TLDE> { type[Group1]="TWO_LEVEL", [ cedilla, diaeresis ] };
 };
diff --git a/xorg-server/xkeyboard-config/symbols/tm b/xorg-server/xkeyboard-config/symbols/tm
index e861b35c3..6c71f48bf 100644
--- a/xorg-server/xkeyboard-config/symbols/tm
+++ b/xorg-server/xkeyboard-config/symbols/tm
@@ -3,9 +3,10 @@
 // Default layout (based on Vista Turkmen layout)
 default  partial
 xkb_symbols "basic" {
-    name[Group1]="Turkmen";
 
     include "us"
+    name[Group1]="Turkmen";
+
     key <TLDE> {	[    zcaron, 	Zcaron,		grave,	asciitilde	]	};
 
     key <AD01> {	[ adiaeresis, 	Adiaeresis,	q,	Q 	]	};
@@ -25,9 +26,9 @@ xkb_symbols "basic" {
 // This layout provides turkmen letter via the AltGr key
 partial
 xkb_symbols "alt" {
-    name[Group1]="Turkmen (Alt-Q)";
 
     include "us"
+    name[Group1]="Turkmen (Alt-Q)";
 
     key <AD06> {	[	  y,	Y,	yacute,		Yacute		]	};
     key <AD07> {	[	  u,	U,	udiaeresis,	Udiaeresis	]	};
@@ -41,5 +42,4 @@ xkb_symbols "alt" {
     key <AB06> {	[	  n,	N,	ncaron,		Ncaron		]	};
 
     include "level3(ralt_switch)"
-
 };
diff --git a/xorg-server/xkeyboard-config/symbols/tw b/xorg-server/xkeyboard-config/symbols/tw
index 8ea31dda6..3a2287222 100644
--- a/xorg-server/xkeyboard-config/symbols/tw
+++ b/xorg-server/xkeyboard-config/symbols/tw
@@ -1,10 +1,10 @@
 default  partial alphanumeric_keys
 xkb_symbols "tw" {
 
-    name[Group1]= "Taiwanese";
-
     include "us(basic)"
 
+    name[Group1]= "Taiwanese";
+
     key <TLDE> { [     grave, asciitilde,    dead_grave,       dead_tilde ] };
     key <AE01> { [	   1,     exclam,         U030D,       exclamdown ] };
     key <AE02> { [	   2,         at,         U0358,      twosuperior ] };
@@ -49,10 +49,10 @@ xkb_symbols "tw" {
 partial alphanumeric_keys
 xkb_symbols "indigenous" {
 
-    name[Group1]= "Taiwanese (indigenous)";
-
     include "tw(tw)"
 
+    name[Group1]= "Taiwanese (indigenous)";
+
     key <AC11> { [     U02BC,   quotedbl,    apostrophe, dead_doubleacute ] };
 
     include "level3(ralt_switch)"
@@ -61,10 +61,10 @@ xkb_symbols "indigenous" {
 partial alphanumeric_keys
 xkb_symbols "saisiyat" {
 
-    name[Group1]= "Saisiyat (Taiwan)";
-
     include "tw(indigenous)"
 
+    name[Group1]= "Saisiyat (Taiwan)";
+
     key <AC10> { [     U02D0,      colon,     semicolon,   dead_diaeresis ] };
 
     include "level3(ralt_switch)"
diff --git a/xorg-server/xkeyboard-config/symbols/ua b/xorg-server/xkeyboard-config/symbols/ua
index 9aea09e05..81d696ec4 100644
--- a/xorg-server/xkeyboard-config/symbols/ua
+++ b/xorg-server/xkeyboard-config/symbols/ua
@@ -12,7 +12,7 @@ xkb_symbols "unicode" {
     name[Group1]= "Ukrainian";
 
     key <TLDE> {    [           U2019, 	apostrophe,    U0301,   asciitilde     ]       };	// Apostrophe and Stress symbol
-    key <AE02> {    [               1,      exclam,  onesuperior               ]       };
+    key <AE01> {    [               1,      exclam,  onesuperior               ]       };
     key <AE02> {    [               2,    quotedbl,  twosuperior               ]       };
     key <AE03> {    [               3,  numerosign,	   U00A7,    U20B4     ]       };	// Paragraph and Hryvnia sign
     key <AE04> {    [               4,   semicolon,	  dollar,    EuroSign  ]       };
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 4948a6345..d5a6c18e4 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -59,9 +59,8 @@ xkb_symbols "basic" {
 partial alphanumeric_keys
 xkb_symbols "euro" {
 
-    name[Group1]= "English (US, with euro on 5)";
-
     include "us(basic)"
+    name[Group1]= "English (US, with euro on 5)";
 
     include "eurosign(5)"
 
@@ -72,9 +71,8 @@ xkb_symbols "euro" {
 partial alphanumeric_keys
 xkb_symbols "intl" {
 
-    name[Group1]= "English (US, international with dead keys)";
-
     include "us(basic)"
+    name[Group1]= "English (US, international with dead keys)";
 
     key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
     key <AE01> { [	   1,     exclam,    exclamdown,      onesuperior ] };
@@ -163,9 +161,8 @@ xkb_symbols "intl" {
 partial alphanumeric_keys
 xkb_symbols "alt-intl" {
 
-  name[Group1]= "English (US, alternative international)";
-
   include "us"
+  name[Group1]= "English (US, alternative international)";
 
   key <TLDE> { [ dead_grave, dead_tilde,    grave,	      asciitilde    ] };
   key <AE05> { [          5, percent,	    EuroSign			    ] };
@@ -257,9 +254,8 @@ xkb_symbols "dvorak" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-intl" {
 
-    name[Group1]= "English (Dvorak, international with dead keys)";
-
     include "us(dvorak)"
+    name[Group1]= "English (Dvorak, international with dead keys)";
 
     key <TLDE> { [dead_grave, dead_tilde,         grave,       asciitilde ] };
 
@@ -336,9 +332,8 @@ xkb_symbols "dvorak-intl" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-alt-intl" {
 
-    name[Group1]= "English (Dvorak alternative international no dead keys)";
-
     include "us(dvorak)"
+    name[Group1]= "English (Dvorak alternative international no dead keys)";
 
     key <AE04> { [         4,  dollar,    EuroSign ] };
 
@@ -548,8 +543,8 @@ xkb_symbols "dvorak-classic" {
 // symbols that usually follows, accented characters are possible for I18N.
 partial alphanumeric_keys
 xkb_symbols "dvp" {
-    include "us(dvorak)"
 
+    include "us(dvorak)"
     name[Group1] = "English (programmer Dvorak)";
 
     //             Unmodified       Shift           AltGr            Shift+AltGr
@@ -619,9 +614,8 @@ xkb_symbols "dvp" {
 partial alphanumeric_keys
 xkb_symbols "rus" {
 
-    name[Group1]= "Russian (US, phonetic)";
-
     include "us(basic)"
+    name[Group1]= "Russian (US, phonetic)";
 
 key.type[group1]="FOUR_LEVEL_ALPHABETIC";
 
@@ -732,6 +726,7 @@ xkb_symbols "mac" {
 
 partial alphanumeric_keys
 xkb_symbols "colemak" {
+
     include "us"
     name[Group1]= "English (Colemak)";
 
@@ -812,9 +807,8 @@ xkb_symbols "colemak" {
 partial alphanumeric_keys
 xkb_symbols "altgr-intl" {
 
-   name[Group1]= "English (international AltGr dead keys)";
-
    include "us(intl)"
+   name[Group1]= "English (international AltGr dead keys)";
 
 // five dead keys moved into level3:
 
@@ -1175,9 +1169,8 @@ xkb_symbols "chr" {
 partial alphanumeric_keys
 xkb_symbols "hbs" {
 
-  name[Group1]= "Serbo-Croatian (US)";
-
   include "us"
+  name[Group1]= "Serbo-Croatian (US)";
 
   key <TLDE> { [ grave, asciitilde ] };
   key <AE06> { [ 6, dead_caron, asciicircum, asciicircum ] };
@@ -1247,9 +1240,8 @@ xkb_symbols "htcdream" {
 partial alphanumeric_keys
 xkb_symbols "workman" {
 
-    name[Group1]= "English (Workman)";
-
     include "us(basic)"
+    name[Group1]= "English (Workman)";
 
     key <AD01> {  [   q,  Q   ] };
     key <AD02> {  [   d,  D   ] };
@@ -1289,9 +1281,8 @@ xkb_symbols "workman" {
 partial alphanumeric_keys
 xkb_symbols "workman-intl" {
 
-    name[Group1]= "English (Workman, international with dead keys)";
-
     include "us(intl)"
+    name[Group1]= "English (Workman, international with dead keys)";
 
     key <AD01> { [     q,          Q,    adiaeresis,       Adiaeresis ] };
     key <AD02> { [     d,          D,           eth,              ETH ] };
@@ -1337,11 +1328,9 @@ xkb_symbols "workman-intl" {
 partial alphanumeric_keys
 xkb_symbols "norman" {
 
-    name[Group1]= "English (Norman)";
-
     include "us(basic)"
+    name[Group1]= "English (Norman)";
 
-    // Alphanumeric section
     key <AD01> { [ q, Q ] };
     key <AD02> { [ w, W ] };
     key <AD03> { [ d, D ] };
@@ -1371,7 +1360,6 @@ xkb_symbols "norman" {
     key <AB05> { [ b, B ] };
     key <AB06> { [ p, P ] };
     key <AB07> { [ m, M ] };
-    // End alphanumeric section
 
     key <CAPS> { [ BackSpace ] };
 
@@ -1383,6 +1371,7 @@ xkb_symbols "norman" {
 // Czech, Slovak and German charecters added as third level symbols to US keyboard layout.
 partial alphanumeric_keys
 xkb_symbols "cz_sk_de" {
+
     include "us"
     name[Group1]="Czech Slovak and German (US)";
 
@@ -1518,7 +1507,6 @@ partial alphanumeric_keys
 xkb_symbols "ats" {
 
     include "us"
-
     name[Group1]= "Atsina";
 
     //Using Dead key to get COMBINING COMMA ABOVE for ejectives on
@@ -1548,7 +1536,6 @@ partial alphanumeric_keys
 xkb_symbols "crd" {
 
   include "us"
-
   name[Group1]= "Coeur d'Alene Salish";
 
   key <AD02> { [         w,           W, U02B7, U02B7 ] };