diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui
index b2846ca..8fcf1d9 100644
--- a/.xkb/symbols/mac_gui
+++ b/.xkb/symbols/mac_gui
@@ -2,14 +2,26 @@ default partial xkb_symbols "mac_levelssym" {
     // LEFT to Begin Line or Beginning of word
     replace key <LEFT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Left,         Left, NoSymbol ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<LEFT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<HOME>,clearmods=Control)]
+        symbols[Group1]= [         Left,         Left, NoSymbol,NoSymbol,Left ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<LEFT>,modifiers=Control,clearmods=Mod1),
+            RedirectKey(key=<HOME>,clearmods=Control),
+            RedirectKey(key=<HOME>,modifiers=Shift,clearmods=Control+Mod1),
+            RedirectKey(key=<LEFT>,modifiers=Shift+Control,clearmods=Mod1)
+        ]
     };
     // Right to End of Line or end of word
     replace key <RGHT> {
         type[Group1]= "ONE_LEVEL_CTRL",
-        symbols[Group1]= [         Right,         Right, NoSymbol ],
-        actions[Group1]= [      NoAction(), RedirectKey(key=<RGHT>,modifiers=Control,clearmods=Mod1), RedirectKey(key=<END>,clearmods=Control)]
+        symbols[Group1]= [         Right,         Right, NoSymbol, NoSymbol,Right ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<RGHT>,modifiers=Control,clearmods=Mod1),
+            RedirectKey(key=<END>,clearmods=Control),
+            RedirectKey(key=<END>,modifiers=Shift,clearmods=Control+Mod1),
+            RedirectKey(key=<RGHT>,modifiers=Shift+Control,clearmods=Mod1)
+        ]
     };
     // Up to Mac Home
     replace key <UP> {
diff --git a/.xkb/types/mac_gui b/.xkb/types/mac_gui
index 3ece19f..3074610 100644
--- a/.xkb/types/mac_gui
+++ b/.xkb/types/mac_gui
@@ -5,9 +5,11 @@ default partial xkb_types "addmac_levels" {
         map[Control]= Level3;
         map[Mod1+Control]= Level3;
         map[Shift+Control]= Level4;
+        map[Shift+Mod1] = Level5;
         level_name[Level1]= "Base";
         level_name[Level2]= "Alt";
-        level_name[Level3]= "With Control";
-        level_name[Level4]= "Shift";
+        level_name[Level3]= "Control";
+        level_name[Level4]= "Shift with Control";
+        level_name[Level5] = "Shift Alt";
     };
 };