diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui
index caf77fe..1f058b5 100644
--- a/.xkb/symbols/mac_gui
+++ b/.xkb/symbols/mac_gui
@@ -162,7 +162,8 @@ default partial xkb_symbols "mac_levelssym" {
             Left,
             Left,
             NoSymbol,
-            NoSymbol
+            NoSymbol,
+            Left
         ],
         actions[Group1]= [
             NoAction(),
@@ -173,6 +174,8 @@ default partial xkb_symbols "mac_levelssym" {
             RedirectKey(key=<HOME>,clearmods=Control),
             RedirectKey(key=<HOME>,clearmods=Control),
             // Change workspace
+            NoAction(),
+            // Super - Change workspace
             NoAction()
         ]
     };
diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term
index e7faaa0..a48d571 100644
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -147,16 +147,14 @@ partial xkb_symbols "mac_global" {
         symbols[Group1]= [
             Left,
             Left,
-            NoSymbol // Default
-            // Left // Elementary
-            // Left // Elementary
+            NoSymbol,
+            Left
         ],
         actions[Group1]= [
             NoAction(),
             NoAction(),
-            RedirectKey(key=<HOME>,clearmods=Shift+Control) // Default
-            // Left // Elementary
-            // RedirectKey(key=<LEFT>,mods=Super,clearmods=Control) // Elementary
+            RedirectKey(key=<HOME>,clearmods=Shift+Control),
+            RedirectKey(key=<LEFT>,mods=Super,clearmods=Control)
         ]
     };
     // END
@@ -165,16 +163,14 @@ partial xkb_symbols "mac_global" {
         symbols[Group1]= [
             Right,
             Right,
-            NoSymbol // Default
-            // Right, // Elementary
-            // Right // Elementary
+            NoSymbol,
+            Right
         ],
         actions[Group1]= [
             NoAction(),
             NoAction(),
-            RedirectKey(key=<END>,clearmods=Shift+Control) // Default
-            // NoAction(), // Elementary
-            // RedirectKey(key=<RGHT>,mods=Super,clearmods=Control) // Elementary
+            RedirectKey(key=<END>,clearmods=Shift+Control),
+            RedirectKey(key=<RGHT>,mods=Super,clearmods=Control)
         ]
     };
     // Full Print Screen
diff --git a/setup.py b/setup.py
index 9f3db48..402447d 100755
--- a/setup.py
+++ b/setup.py
@@ -113,10 +113,16 @@ def setShortcuts():
 			print('     xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --create --type string --set "move_window_next_workspace_key"\n')
 		elif distro == "fedora" and dename == "gnome":
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['<Super>d']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left \"['<Primary><Alt>Left','<Super>Left']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right \"['<Primary><Alt>Right','<Super>Right']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['<Super>Page_Up','<Super>Left']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['<Super>Page_Down','<Super>Right']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
+			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['<Super><Alt>Right']\"")
+			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['<Super><Alt>Left']\"")
+			# org.gnome.mutter.keybindings toggle-tiled-right ['<Super>Right']
+			# org.gnome.mutter.keybindings toggle-tiled-left ['<Super>Left']
 		elif distro == "manjaro linux" and dename == "kde":
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "Alt+F10,Meta+PgUp,Maximize Window"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"')