diff --git a/saretlinux.sh b/saretlinux.sh
index 72f7ea8..1abe5be 100644
--- a/saretlinux.sh
+++ b/saretlinux.sh
@@ -4,6 +4,7 @@ saret	ALL=(ALL) NOPASSWD:ALL
 EOF
 fi
 if [ "$(ls /home |grep saret)" != "saret" ]; then
+    sed -i "s/main$/main contrinb non-free/g" /etc/apt/sources.list
     sudo apt -y update
     sudo apt -y install wget nano curl zsh git lsb-release htop apt-transport-https xorg slim ncdu sshpass fish btop
     passwd root -d
@@ -15,15 +16,15 @@ if [ "$(ls /home |grep saret)" != "saret" ]; then
     mkdir /SSH
     chown $username:$username /SSH -R
     chmod au+xwr /SSH -R
-    curl -sSL "https://www.googleapis.com/drive/v3/files/1T9QJRJf-PudtnOc_LWWlcaGzmlFetj8l?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/DebianMachine.pub
-    curl -sSL "https://www.googleapis.com/drive/v3/files/1etRrxKbD57DCyZiqhA7uOMWHzHAsclyQ?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/WindowsMachine.pub
-    curl -sSL "https://www.googleapis.com/drive/v3/files/1qPxPILbk9X2wK4nbXnyGCOZs-jjq6NXZ?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/DebianMachine
-    curl -sSL "https://www.googleapis.com/drive/v3/files/10y_s7IHOyqqUfdWB-HwRfYOy2EGlEAro?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/WindowsMachine
-    curl -sSL "https://www.googleapis.com/drive/v3/files/10Danv9wAuMkx2A24WV3x1ZKTpE7DXbww?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/Phoney
-    curl -sSL "https://www.googleapis.com/drive/v3/files/10JLW5RoDHibs5swUr6XOCrWSXy2RzUuh?alt=media&key=AIzaSyCy8ppkVWYQFSznbe1SHuAITSZ-ux_ZCZk" >/SSH/Phoney.pub
-    sshpass -p "qwerty" ssh-copy-id -i /SSH/DebianMachine.pub -o StrictHostKeyChecking=no saret@$HOSTNAME
-    sshpass -p "qwerty" ssh-copy-id -i /SSH/WindowsMachine.pub -o StrictHostKeyChecking=no saret@$HOSTNAME
-    sshpass -p "qwerty" ssh-copy-id -i /SSH/Phoney.pub -o StrictHostKeyChecking=no saret@$HOSTNAME
+    mkdir -p /home/saret/.ssh 2>/dev/null
+    chown saret:saret /home/saret/.ssh -R
+    touch /home/saret/.ssh/authorized_keys 
+    # Debian Machine
+    curl -sSL "https://gist.githubusercontent.com/1kamma/5c283f4fdeff2d5a6e6e97b310f3bc8b/raw/5216f05644e6924ff8c33b0123643dc1ed90ce2f/DebianMachine.pub" >>/home/saret/.ssh/authorized_keys 
+    # Windows Machine
+    curl -sSL "https://gist.githubusercontent.com/1kamma/5c283f4fdeff2d5a6e6e97b310f3bc8b/raw/72eefec64df079cd4fe07e0b723ccdc02d4c1141/WindowsMachine.pub" >>/home/saret/.ssh/authorized_keys 
+    # Phoney
+    curl -sSL "https://gist.githubusercontent.com/1kamma/5c283f4fdeff2d5a6e6e97b310f3bc8b/raw/8ac7c2cc43a0421646eb10351d08aa8d19c274e2/phoney.pub" >>/home/saret/.ssh/authorized_keys 
     sudo reboot
     su $username
 fi
@@ -36,7 +37,7 @@ EOF
     sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AD5F235DF639B041
     sudo apt-get update
     sudo apt-get install -y google-drive-ocamlfuse
-    curl -s https://notesalexp.org/debian/alexp_key.asc | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/alexp_key.gpg --import
+    curl -s https://notesalexp.org/debian/alexp_key.asc | sudo gpg --armor --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/alexp_key.gpg --import
     sudo chmod a+r /etc/apt/trusted.gpg.d -R
     sudo apt-get update -oAcquire::AllowInsecureRepositories=true
     sudo apt-get -y install notesalexp-keyring -oAcquire::AllowInsecureRepositories=true