harmonize some whitespace, to slightly improve readability

Also, reshuffle an option to after the ones that it includes,
as is done elsewhere in the file.

12 files changed, 95 insertions, 92 deletions

diff --git a/compat/iso9995 b/compat/iso9995
index 0f3025b..c5c7899 100644
--- a/compat/iso9995
+++ b/compat/iso9995
@@ -62,6 +62,7 @@ default partial xkb_compatibility "default" {
 	virtualModifier= AltGr;
 	action= LockGroup(group=-1);
     };
+
     interpret ISO_First_Group {
 	action= LockGroup(group=1);
     };
diff --git a/compat/pc b/compat/pc
index f69b54d..eb11dfc 100644
--- a/compat/pc
+++ b/compat/pc
@@ -5,6 +5,7 @@ default partial xkb_compatibility "pc" {
     virtual_modifiers  Alt;
 
     setMods.clearLocks= True;
+
     interpret Alt_L+Any {
 	virtualModifier= Alt;
 	action = SetMods(modifiers=modMapMods);
diff --git a/symbols/group b/symbols/group
index 74bbf0d..f7ad9ef 100644
--- a/symbols/group
+++ b/symbols/group
@@ -10,13 +10,6 @@ xkb_symbols "lswitch" {
     key <LALT> {[  Mode_switch,  Multi_key  ]};
 };
 
-// Either Win key (while pressed) chooses the next group.
-partial modifier_keys
-xkb_symbols "win_switch" {
-    include "group(lwin_switch)"
-    include "group(rwin_switch)"
-};
-
 // The left Win key (while pressed) chooses the next group.
 partial modifier_keys
 xkb_symbols "lwin_switch" {
@@ -29,6 +22,13 @@ xkb_symbols "rwin_switch" {
     key <RWIN> {[  Mode_switch,  Multi_key  ]};
 };
 
+// Either Win key (while pressed) chooses the next group.
+partial modifier_keys
+xkb_symbols "win_switch" {
+    include "group(lwin_switch)"
+    include "group(rwin_switch)"
+};
+
 // The Menu key (while pressed) chooses the next group,
 // while Shift+Menu acts as Menu.
 partial modifier_keys
@@ -58,29 +58,29 @@ xkb_symbols "lalt_toggle" {
 // (depending on which Shift is pressed first).
 partial modifier_keys
 xkb_symbols "shifts_toggle" {
-    key <LFSH> { [ Shift_L, ISO_Prev_Group ] };
-    key <RTSH> { [ Shift_R, ISO_Next_Group ] };
+    key <LFSH> {[  Shift_L,  ISO_Prev_Group  ]};
+    key <RTSH> {[  Shift_R,  ISO_Next_Group  ]};
 };
 
 // Pressing Shift+Caps_Lock switches to the next group.
 partial modifier_keys
 xkb_symbols "shift_caps_toggle" {
-    key <CAPS> { [ Caps_Lock, ISO_Next_Group ] };
+    key <CAPS> {[  Caps_Lock,  ISO_Next_Group  ]};
 };
 
 // Pressing Caps_Lock selects the first group,
 // pressing Shift+Caps_Lock selects the second group.
 partial modifier_keys
 xkb_symbols "shift_caps_switch" {
-    key <CAPS> { [ ISO_First_Group, ISO_Last_Group ] };
+    key <CAPS> {[  ISO_First_Group,  ISO_Last_Group  ]};
 };
 
 // Pressing Alt+Space switches to the next group.
 partial modifier_keys
 xkb_symbols "alt_space_toggle" {
     key <SPCE> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ space, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  space,  ISO_Next_Group  ]
     };
 };
 
@@ -89,7 +89,7 @@ partial modifier_keys
 xkb_symbols "win_space_toggle" {
     key <SPCE> {
         type[Group1] = "PC_SUPER_LEVEL2",
-        symbols[Group1] = [ space, ISO_Next_Group ]
+        symbols[Group1] = [  space,  ISO_Next_Group  ]
   };
 };
 
@@ -98,7 +98,7 @@ partial modifier_keys
 xkb_symbols "ctrl_space_toggle" {
     key <SPCE> {
         type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ space, ISO_Next_Group ]
+        symbols[Group1] = [  space,  ISO_Next_Group  ]
   };
 };
 
@@ -126,28 +126,28 @@ xkb_symbols "lctrl_rctrl_switch" {
 partial modifier_keys
 xkb_symbols "lctrl_lshift_toggle" {
     key <LFSH> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ Shift_L, ISO_Next_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  Shift_L,  ISO_Next_Group  ]
     };
-    key <LCTL> { [ Control_L, ISO_Next_Group ] };
+    key <LCTL> {[  Control_L,  ISO_Next_Group  ]};
 };
 
 partial modifier_keys
 xkb_symbols "lctrl_lshift_toggle_rev" {
     key <LFSH> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ Shift_L, ISO_Prev_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  Shift_L,  ISO_Prev_Group  ]
     };
-    key <LCTL> { [ Control_L, ISO_Prev_Group ] };
+    key <LCTL> {[  Control_L,  ISO_Prev_Group  ]};
 };
 
 partial modifier_keys
 xkb_symbols "rctrl_rshift_toggle" {
     key <RTSH> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ Shift_R, ISO_Next_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  Shift_R,  ISO_Next_Group  ]
     };
-    key <RCTL> { [ Control_R, ISO_Next_Group ] };
+    key <RCTL> {[  Control_R,  ISO_Next_Group  ]};
 };
 
 partial modifier_keys
@@ -169,36 +169,36 @@ xkb_symbols "ctrl_shift_toggle_bidir" {
 partial modifier_keys
 xkb_symbols "lctrl_lalt_toggle" {
     key <LALT> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
     };
     key <LCTL> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Control_L, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Control_L,  ISO_Next_Group  ]
     };
 };
 
 partial modifier_keys
 xkb_symbols "lctrl_lalt_toggle_rev" {
     key <LALT> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Prev_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
     };
     key <LCTL> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Control_L, ISO_Prev_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Control_L,  ISO_Prev_Group  ]
     };
 };
 
 partial modifier_keys
 xkb_symbols "rctrl_ralt_toggle" {
     key <RALT> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
     };
     key <RCTL> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Control_R, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Control_R,  ISO_Next_Group  ]
     };
 };
 
@@ -221,33 +221,33 @@ xkb_symbols "ctrl_alt_toggle_bidir" {
 partial modifier_keys
 xkb_symbols "lalt_lshift_toggle" {
     key <LALT> {
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
+        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
     };
     key <LFSH> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Shift_L, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Shift_L,  ISO_Next_Group  ]
     };
 };
 
 partial modifier_keys
 xkb_symbols "lalt_lshift_toggle_rev" {
     key <LALT> {
-        symbols[Group1] = [ NoSymbol, ISO_Prev_Group ]
+        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
     };
     key <LFSH> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Shift_L, ISO_Prev_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Shift_L,  ISO_Prev_Group  ]
     };
 };
 
 partial modifier_keys
 xkb_symbols "ralt_rshift_toggle" {
     key <RALT> {
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
+        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
     };
     key <RTSH> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Shift_R, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Shift_R,  ISO_Next_Group  ]
     };
 };
 
@@ -288,12 +288,12 @@ xkb_symbols "rwin_toggle" {
 partial modifier_keys
 xkb_symbols "ctrls_toggle" {
     key <LCTL> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Prev_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  NoSymbol,  ISO_Prev_Group  ]
     };
     key <RCTL> {
-        type[Group1]="PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ NoSymbol, ISO_Next_Group ]
+        type[Group1] = "PC_CONTROL_LEVEL2",
+        symbols[Group1] = [  NoSymbol,  ISO_Next_Group  ]
     };
 };
 
@@ -302,12 +302,12 @@ xkb_symbols "ctrls_toggle" {
 partial modifier_keys
 xkb_symbols "alts_toggle" {
     key <LALT> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Alt_L, ISO_Prev_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Alt_L,  ISO_Prev_Group  ]
     };
     key <RALT> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ Alt_R, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  Alt_R,  ISO_Next_Group  ]
     };
 };
 
@@ -316,12 +316,12 @@ xkb_symbols "alts_toggle" {
 partial modifier_keys
 xkb_symbols "alt_altgr_toggle" {
     key <LALT> {
-        type[Group1]="FOUR_LEVEL",
-        symbols[Group1] = [ Alt_L, Alt_L, ISO_Prev_Group, ISO_Prev_Group ]
+        type[Group1] = "FOUR_LEVEL",
+        symbols[Group1] = [  Alt_L,  Alt_L,  ISO_Prev_Group,  ISO_Prev_Group  ]
     };
     key <RALT> {
-        type[Group1]="PC_ALT_LEVEL2",
-        symbols[Group1] = [ ISO_Level3_Shift, ISO_Next_Group ]
+        type[Group1] = "PC_ALT_LEVEL2",
+        symbols[Group1] = [  ISO_Level3_Shift,  ISO_Next_Group  ]
     };
 };
 
@@ -355,7 +355,7 @@ partial modifier_keys
 xkb_symbols "alt_caps_toggle" {
     key <CAPS> {
        type="PC_ALT_LEVEL2",
-       symbols[Group1] = [ Caps_Lock, ISO_Next_Group ]
+       symbols[Group1] = [  Caps_Lock,  ISO_Next_Group  ]
     };
 };
 
@@ -376,11 +376,11 @@ partial modifier_keys
 xkb_symbols "lctrl_lwin_rctrl_menu" {
     key <LWIN> {
         type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ Super_L, ISO_First_Group ]
+        symbols[Group1] = [  Super_L,  ISO_First_Group  ]
     };
     key <MENU> {
         type[Group1] = "PC_CONTROL_LEVEL2",
-        symbols[Group1] = [ Menu, ISO_Last_Group ]
+        symbols[Group1] = [  Menu,  ISO_Last_Group  ]
     };
 };
 
diff --git a/types/basic b/types/basic
index fff06be..32f05b9 100644
--- a/types/basic
+++ b/types/basic
@@ -20,7 +20,7 @@ default xkb_types "basic" {
     };
 
     type "ALPHABETIC" {
-	modifiers = Shift+Lock;
+	modifiers = Shift + Lock;
 	map[Shift] = Level2;
 	map[Lock] = Level2;
 	level_name[Level1] = "Base";
diff --git a/types/cancel b/types/cancel
index adc9f19..b738559 100644
--- a/types/cancel
+++ b/types/cancel
@@ -1,7 +1,7 @@
 default partial xkb_types "Shift_Cancels_Caps" {
 
 override type "TWO_LEVEL" {
-    modifiers = Shift+Lock;
+    modifiers = Shift + Lock;
     map[Shift] = Level2;
     preserve[Lock]= Lock;
     level_name[Level1] = "Base";
diff --git a/types/caps b/types/caps
index 7181630..75e2bca 100644
--- a/types/caps
+++ b/types/caps
@@ -2,7 +2,7 @@
 // Shift "pauses" CapsLock.
 partial xkb_types "internal" {
     type "ALPHABETIC" {
-	modifiers = Shift+Lock;
+	modifiers = Shift + Lock;
 	map[Shift] = Level2;
 	preserve[Lock] = Lock;
 	level_name[Level1] = "Base";
@@ -10,7 +10,7 @@ partial xkb_types "internal" {
     };
 
     type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	preserve[Lock] = Lock;
@@ -26,7 +26,7 @@ partial xkb_types "internal" {
     };
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	preserve[Lock] = Lock;
@@ -54,7 +54,7 @@ partial xkb_types "internal_nocancel" {
     };
 
     type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+LevelThree;
+	modifiers = Shift + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[LevelThree] = Level3;
@@ -67,7 +67,7 @@ partial xkb_types "internal_nocancel" {
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
         // the same as FOUR_LEVEL_ALPHABETIC
-	modifiers = Shift+LevelThree;
+	modifiers = Shift + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[LevelThree] = Level3;
@@ -83,7 +83,7 @@ partial xkb_types "internal_nocancel" {
 // Shift "pauses" CapsLock.
 partial xkb_types "shift" {
     type "ALPHABETIC" {
-	modifiers = Shift+Lock;
+	modifiers = Shift + Lock;
 	map[Shift] = Level2;
 	map[Lock] = Level2;
 	level_name[Level1] = "Base";
@@ -91,7 +91,7 @@ partial xkb_types "shift" {
     };
 
     type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
@@ -106,7 +106,7 @@ partial xkb_types "shift" {
     };
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
@@ -127,7 +127,7 @@ partial xkb_types "shift" {
 // Shift does not cancel CapsLock.
 partial xkb_types "shift_nocancel" {
     type "ALPHABETIC" {
-	modifiers = Shift+Lock;
+	modifiers = Shift + Lock;
 	map[Shift] = Level2;
 	map[Lock] = Level2;
 	map[Shift+Lock] = Level2;
@@ -136,7 +136,7 @@ partial xkb_types "shift_nocancel" {
     };
 
     type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] =  Level1;
 	map[Shift] = Level2;
 	map[Lock] =  Level2;
@@ -152,7 +152,7 @@ partial xkb_types "shift_nocancel" {
     };
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] =  Level1;
 	map[Shift] = Level2;
 	map[Lock] =  Level2;
diff --git a/types/extra b/types/extra
index 156b8e5..3cf7ba7 100644
--- a/types/extra
+++ b/types/extra
@@ -6,7 +6,7 @@ default partial xkb_types "default" {
     virtual_modifiers LevelThree;
 
     type "FOUR_LEVEL" {
-	modifiers = Shift+LevelThree;
+	modifiers = Shift + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[LevelThree] = Level3;
@@ -18,7 +18,7 @@ default partial xkb_types "default" {
     };
 
     type "FOUR_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
@@ -33,7 +33,7 @@ default partial xkb_types "default" {
     };
 
     type "FOUR_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree;
+	modifiers = Shift + Lock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
@@ -53,7 +53,7 @@ default partial xkb_types "default" {
     // NumLock (with active shifting like in KEYPAD).  LevelThree overrides
     // this mode, with two additional shifted levels.
     type "FOUR_LEVEL_MIXED_KEYPAD" {
-        modifiers = Shift+NumLock+LevelThree;
+        modifiers = Shift + NumLock + LevelThree;
         map[None] = Level1;
         map[Shift+NumLock] = Level1;
         map[NumLock] = Level2;
@@ -70,7 +70,7 @@ default partial xkb_types "default" {
 
     // Base level, two shifted LevelThree levels, one Ctrl+Alt command level.
     type "FOUR_LEVEL_X" {
-        modifiers = Shift+LevelThree+Control+Alt;
+        modifiers = Shift + LevelThree + Control + Alt;
         map[None] = Level1;
         map[LevelThree] = Level2;
         map[Shift+LevelThree] = Level3;
@@ -86,7 +86,7 @@ default partial xkb_types "default" {
     // present in Unicode that are made up of two separate letters
     // (forms like LJ, Lj, and lj; NJ, Nj, and nj; etcetera).
     type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" {
-        modifiers = Shift+Lock+LevelThree;
+        modifiers = Shift + Lock + LevelThree;
         map[None] = Level1;
         map[Shift] = Level2;
         map[Lock] = Level4;
@@ -106,7 +106,7 @@ default partial xkb_types "default" {
     // plus a fifth level when CapsLock (and only CapsLock) is active
     // -- CapsLock is ignored when Shift and/or LevelThree is held.
     type "FOUR_LEVEL_PLUS_LOCK" {
-        modifiers = Shift+Lock+LevelThree;
+        modifiers = Shift + Lock + LevelThree;
         map[None] = Level1;
         map[Shift] = Level2;
         map[LevelThree] = Level3;
@@ -125,10 +125,11 @@ default partial xkb_types "default" {
 
 // This enables the four-level shifting also for the keypad.
 partial xkb_types "keypad" {
+
     virtual_modifiers LevelThree;
 
     type "FOUR_LEVEL_KEYPAD" {
-	modifiers = Shift+NumLock+LevelThree;
+	modifiers = Shift + NumLock + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[NumLock] = Level2;
diff --git a/types/iso9995 b/types/iso9995
index 137a522..74b3ff9 100644
--- a/types/iso9995
+++ b/types/iso9995
@@ -6,7 +6,7 @@ default partial xkb_types "default" {
     virtual_modifiers LevelThree;
 
     type "THREE_LEVEL" {
-	modifiers = Shift+LevelThree;
+	modifiers = Shift + LevelThree;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[LevelThree] = Level3;
diff --git a/types/level5 b/types/level5
index f4c6a9d..9403cd6 100644
--- a/types/level5
+++ b/types/level5
@@ -6,7 +6,7 @@ default partial xkb_types "default" {
     virtual_modifiers  LevelThree, LevelFive;
 
     type "EIGHT_LEVEL" {
-	modifiers = Shift+LevelThree+LevelFive;
+	modifiers = Shift + LevelThree + LevelFive;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[LevelThree] = Level3;
@@ -26,7 +26,7 @@ default partial xkb_types "default" {
     };
 
     type "EIGHT_LEVEL_ALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree+LevelFive;
+	modifiers = Shift + Lock + LevelThree + LevelFive;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
@@ -54,7 +54,7 @@ default partial xkb_types "default" {
     };
 
     type "EIGHT_LEVEL_SEMIALPHABETIC" {
-	modifiers = Shift+Lock+LevelThree+LevelFive;
+	modifiers = Shift + Lock + LevelThree + LevelFive;
 	map[None] = Level1;
 	map[Shift] = Level2;
 	map[Lock]  = Level2;
diff --git a/types/mousekeys b/types/mousekeys
index 0bf8384..36434ed 100644
--- a/types/mousekeys
+++ b/types/mousekeys
@@ -1,8 +1,9 @@
 default partial xkb_types "default" {
+
     virtual_modifiers Alt;
 
     type "SHIFT+ALT" {
-	modifiers = Shift+Alt;
+	modifiers = Shift + Alt;
 	map[Shift+Alt] = Level2;
 	level_name[Level1] = "Base";
 	level_name[Level2] = "Shift+Alt";
diff --git a/types/numpad b/types/numpad
index 8903b16..458a64f 100644
--- a/types/numpad
+++ b/types/numpad
@@ -1,6 +1,6 @@
 default partial xkb_types "pc" {
     type "KEYPAD" {
-	modifiers = Shift+NumLock;
+	modifiers = Shift + NumLock;
 	map[None] = Level1;
 	map[NumLock] = Level2;
 	map[Shift+NumLock] = Level1;
@@ -22,7 +22,7 @@ partial xkb_types "mac" {
 
 partial xkb_types "microsoft" {
     type "KEYPAD" {
-        modifiers = Shift+NumLock;
+        modifiers = Shift + NumLock;
         map[None] = Level1;
         preserve[Shift] = Shift;
         map[NumLock] = Level2;
@@ -39,7 +39,7 @@ partial xkb_types "microsoft" {
 // FOUR_LEVEL_MIXED_KEYPAD, so that's the one we are going to override.
 partial xkb_types "shift3" {
     type "FOUR_LEVEL_MIXED_KEYPAD" {
-        modifiers = Shift+NumLock+Control+Alt;
+        modifiers = Shift + NumLock + Control + Alt;
 
         // NumLock Off => navigate using cursor keys
         map[None] = Level1;
@@ -57,7 +57,6 @@ partial xkb_types "shift3" {
         // Ctrl + Alt, regardless of NumLock and Shift => command keys
         map[Control+Alt] = Level4;
 
-        // reverse map from levels to modifiers
         level_name[Level1] = "Base";
         level_name[Level2] = "NumLock";
         level_name[Level3] = "Shift+NumLock";
diff --git a/types/pc b/types/pc
index 03fe1c8..d0b6ea6 100644
--- a/types/pc
+++ b/types/pc
@@ -32,7 +32,7 @@ default partial xkb_types "default" {
     };
 
     type "CTRL+ALT" {
-        modifiers = Control+Alt+Shift+LevelThree;
+        modifiers = Shift + LevelThree + Control + Alt;
         map[None] = Level1;
         map[Shift] = Level2;
         map[LevelThree] = Level3;
@@ -55,7 +55,7 @@ default partial xkb_types "default" {
    // FIXME: Should really use RControl but it seems not to be enabled by
    // default and touching this requires a lot of testing.
    type "LOCAL_EIGHT_LEVEL" {
-	modifiers = Shift+Lock+LevelThree+Control;
+	modifiers = Shift + Lock + LevelThree + Control;
 
 	map[None]       = Level1;
 	map[Lock+Shift] = Level1;