diff --git a/chromebook.sh b/chromebook.sh
index c6bc587..637f3f6 100755
--- a/chromebook.sh
+++ b/chromebook.sh
@@ -5,8 +5,12 @@ cp ./.xkb/symbols/mac_gui ~/.xkb/symbols/mac_gui
 cp ./.xkb/types/mac_term ~/.xkb/types/mac_term
 setxkbmap -option
 setxkbmap -print > ~/.xkb/keymap/kbd.chromebook.gui
+setxkbmap -print > ~/.xkb/keymap/kbd.chromebook.term
 line=$(cat ~/.xkb/keymap/kbd.chromebook.gui | grep -n 'xkb_symbols' | cut -f1 -d:)
 sed -ie "${line}s/\"/+chromebook(swap_lalt_lctrl)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.chromebook.gui
 sleep 1
 line=$(cat ~/.xkb/keymap/kbd.chromebook.gui | grep -n 'xkb_types' | cut -f1 -d:)
 sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.chromebook.gui
+sleep 1
+line=$(cat ~/.xkb/keymap/kbd.chromebook.term | grep -n 'xkb_symbols' | cut -f1 -d:)
+sed -ie "${line}s/\"/+altwin(swap_alt_win)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.chromebook.term
diff --git a/install.py b/install.py
index 3073ba5..644eb4e 100755
--- a/install.py
+++ b/install.py
@@ -59,12 +59,19 @@ def keyboard_detect():
     elif system_type == "2":
         system_type = "chromebook"
     elif system_type == "3":
-        system_type = "mac"
+        result = subprocess.check_output('lsmod | grep hid_apple 1>/dev/null; echo $?', shell=True).decode('utf-8')
+        if result.strip() == "0":
+            system_type = "mac"
+        else:
+            system_type = "mac_only"
+            print("Apple hid_apple driver is not loaded, a keymap that is specific for only Apple keyboards will be used.")
 
     if system_type == "windows" or system_type == "mac":
         subprocess.check_output('/bin/bash -c ./mac_wordwise.sh', shell=True).decode('utf-8')
-        cmdgui = '"/usr/bin/setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.onelvl $DISPLAY"'
-        # subprocess.check_output('echo "1" > /sys/module/hid_apple/parameters/swap_opt_cmd', shell=True).decode('utf-8')
+        cmdgui = '"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY"'
+    elif system_type == "mac_only":
+        subprocess.check_output('/bin/bash -c ./mac_only.sh', shell=True).decode('utf-8')
+        cmdgui = '"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY"'
     elif system_type == "chromebook":
         subprocess.check_output('/bin/bash -c ./chromebook.sh', shell=True).decode('utf-8')
         cmdgui = '"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY"'
@@ -75,13 +82,11 @@ def keyboard_detect():
 
     if swap_behavior == 1:
         print("Setting up " + system_type + " keyswap as a service.")
-        print("You can disable and remove the service by using the following commands.")
-        print("systemctl --user stop keyswap")
-        print("systemctl --user disable keyswap")
-        print("rm -rf ~/.config/autostart/keyswap.sh")
-        print("rm -rf ~/.config/xactive.sh")
+        print("You can disable and remove the service by using the following command in the Kinto directory.")
+        print("./uninstall.sh")
+
         keyswapcmd = '/bin/bash -c "./keyswap_service.sh 1 0 ' + system_type + ' ' + str(internalid).strip() + ' ' + str(usbid).strip() + ' ' + str(chromeswap) + '"'
-        print(keyswapcmd)
+        # print(keyswapcmd)
         subprocess.check_output(keyswapcmd, shell=True).decode('utf-8')
     else:
         print("Setting up " + system_type + " keyswap inside your profiles ~/.Xsession file.")
@@ -89,9 +94,15 @@ def keyboard_detect():
         keyswapcmd = '/bin/bash -c "./keyswap_service.sh 0 ' + cmdgui + '"'
         subprocess.check_output(keyswapcmd, shell=True).decode('utf-8')
 
-    print("Please run this command in the terminal if you are using a Windows or Macbook.")
-    print("Your keymapping will not work right on Apple keyboards without it.")
-    print("echo '1' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd")
+    if system_type == "mac":
+        print()
+        print("An Apple keyboard with the hid_apple driver was detected.")
+        print("Please run the following commands to swap alt/option and Command.")
+        print("Your Kinto keymapping will not work right on Apple keyboards without it.")
+        print()
+        print("echo '1' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd")
+        print('options hid_apple swap_opt_cmd=1" | sudo tee -a /etc/modprobe.d/hid_apple.conf')
+        print('update-initramfs -u -k all')
         
 
 
diff --git a/mac_only.sh b/mac_only.sh
new file mode 100755
index 0000000..bb6668f
--- /dev/null
+++ b/mac_only.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+mkdir -p ~/.xkb/{keymap,symbols,types}
+cp ./.xkb/symbols/mac_gui ~/.xkb/symbols/mac_gui
+cp ./.xkb/types/mac_term ~/.xkb/types/mac_term
+setxkbmap -option
+setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui
+setxkbmap -print > ~/.xkb/keymap/kbd.mac.term
+line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:)
+sed -ie "${line}s/\"/+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.gui
+sleep 1
+line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:)
+sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.mac.gui
+sleep 1
+line=$(cat ~/.xkb/keymap/kbd.mac.term | grep -n 'xkb_symbols' | cut -f1 -d:)
+sed -ie "${line}s/\"/+altwin(alt_super_win)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.term
diff --git a/mac_wordwise.sh b/mac_wordwise.sh
index ceed7c8..daad377 100755
--- a/mac_wordwise.sh
+++ b/mac_wordwise.sh
@@ -4,8 +4,12 @@ cp ./.xkb/symbols/mac_gui ~/.xkb/symbols/mac_gui
 cp ./.xkb/types/mac_term ~/.xkb/types/mac_term
 setxkbmap -option
 setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui
+setxkbmap -print > ~/.xkb/keymap/kbd.mac.term
 line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:)
 sed -ie "${line}s/\"/+altwin(ctrl_alt_win)+mac_gui(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.gui
 sleep 1
 line=$(cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:)
 sed -ie "${line}s/\"/+mac_gui(addmac_levels)\"/2" ~/.xkb/keymap/kbd.mac.gui
+sleep 1
+line=$(cat ~/.xkb/keymap/kbd.mac.term | grep -n 'xkb_symbols' | cut -f1 -d:)
+sed -ie "${line}s/\"/+altwin(swap_alt_win)+mac_term(mac_levelssym)\"/2" ~/.xkb/keymap/kbd.mac.term
diff --git a/system-config/xactive.sh b/system-config/xactive.sh
index f1da0b6..0713509 100755
--- a/system-config/xactive.sh
+++ b/system-config/xactive.sh
@@ -18,6 +18,10 @@ if [[ "$systemtype" == "windows" || "$systemtype" == "mac" ]]; then
 	swapcmd_gui="setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY"
 	check_gt="setxkbmap -query | grep -v 'swap_alt_win' 1>/dev/null"
 	check_tg="setxkbmap -query | grep -q 'swap_alt_win'"
+elif [[ "$systemtype" == "mac_only" ]]; then
+	swapcmd_gui="setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY"
+	check_gt="setxkbmap -query | grep -v 'alt_super_win' 1>/dev/null"
+	check_tg="setxkbmap -query | grep -q 'alt_super_win'"
 elif [[ "$swapbehavior" == "both_mac" ]]; then
 	swapcmd_gui="setxkbmap -option;setxkbmap -option ctrl:swap_lwin_lctl; xkbcomp -w0 -i $internalid -I$HOME/.xkb ~/.xkb/keymap/kbd.chromebook.gui $DISPLAY"
 	swapcmd_term="setxkbmap -option;setxkbmap -device $internalid -option 'altwin:swap_alt_win'"