diff --git a/test.py b/test.py
index 44e1d6f..b7a848c 100755
--- a/test.py
+++ b/test.py
@@ -275,21 +275,21 @@ def mac_keys_terminal():
 if uitype == 'gui':
     if chromebook == '1':
         if apply_rules == '1':
-            subprocess.check_output('setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.gui $DISPLAY', shell=True).decode('utf-8')
+            subprocess.check_output('setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY', shell=True).decode('utf-8')
         print()
         print("Testing chromebook - GUI apps - Kinto keymapping...")
         chromebook_keys_gui()
 
     if windows == '1':
         if apply_rules == '1':
-            subprocess.check_output('setxkbmap -option;setxkbmap -option altwin:ctrl_alt_win', shell=True).decode('utf-8')
+            subprocess.check_output('setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY', shell=True).decode('utf-8')
         print()
         print ("Testing windows keyboard - GUI apps - Kinto keymapping...")
         windows_keys_gui()
 
     if mac == '1':
         if apply_rules == '1':
-            subprocess.check_output('setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl', shell=True).decode('utf-8')
+            subprocess.check_output('setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY', shell=True).decode('utf-8')
         print ("Testing mac keyboard - GUI apps - Kinto keymapping...")
         mac_keys_gui()
 
@@ -308,7 +308,7 @@ if uitype == 'term':
 
     if mac == '1':
         if apply_rules == '1':
-            subprocess.check_output('setxkbmap -option', shell=True).decode('utf-8')
+            subprocess.check_output('setxkbmap -option;setxkbmap -option altwin:swap_alt_win', shell=True).decode('utf-8')
         print ("Testing mac keyboard - terminal - Kinto keymapping...")
         mac_keys_terminal()