diff --git a/.config/autostart/gnome-keyring-ssh.desktop b/.config/autostart/gnome-keyring-ssh.desktop
new file mode 100644
index 0000000..1f17aea
--- /dev/null
+++ b/.config/autostart/gnome-keyring-ssh.desktop
@@ -0,0 +1,157 @@
+[Desktop Entry]
+Type=Application
+Name[af]=SSH-sleutelagent
+Name[ar]=عميل مفاتيح SSH
+Name[as]=SSH কি সহায়ক
+Name[ast]=Axente de claves SSH
+Name[be]=SSH-агент ключоў
+Name[bg]=Агентът на SSH за ключове
+Name[bn]=SSH কী এজেন্ট
+Name[bn_IN]=SSH কি এজেন্ট
+Name[bs]=Agent za SSH ključeve
+Name[ca]=Agent de claus SSH
+Name[ca@valencia]=Agent de claus SSH
+Name[cs]=Agent klíčů SSH
+Name[da]=SSH-nøgleagent
+Name[de]=SSH-Schlüsselagent
+Name[el]=Πράκτορας κλειδιού SSH
+Name[en_GB]=SSH Key Agent
+Name[eo]=SSH-ŝlosila agento
+Name[es]=Agente de claves SSH
+Name[et]=SSH-võtmete agent
+Name[eu]=SSH gako-agentea
+Name[fa]=عامل کلید SSH
+Name[fi]=SSH-avainten agentti
+Name[fr]=Agent de clés SSH
+Name[fur]=Agjent clâfs SSH
+Name[gd]=Àidseant iuchair SSH
+Name[gl]=Axente de chave SSH
+Name[gu]=SSH કી ઍજન્ટ
+Name[he]=סוכן מפתחות SSH
+Name[hi]=AFS कुँजी प्रतिनिधि
+Name[hr]=Agent SSH ključa
+Name[hu]=SSH-kulcs ügynök
+Name[id]=Agen Kunci SSH
+Name[it]=Agente chiavi SSH
+Name[ja]=SSH 鍵エージェント
+Name[kk]=SSH кілттер агенті
+Name[km]=ភ្នាក់ងារ​សោ SSH
+Name[kn]=SSH ಕೀಲಿ ಮಧ್ಯವರ್ತಿ
+Name[ko]=SSH 키 에이전트
+Name[lt]=SSH raktų tarnyba
+Name[lv]=SSH atslēgu aģents
+Name[mjw]=SSH Key Agent
+Name[mk]=Агент за SSH клучеви
+Name[ml]=എസ്എസ്എച് കീ ഏജന്റ്
+Name[mr]=SSH कि एजंट
+Name[ms]=Ejen Kunci SSH
+Name[nb]=SSH-nøkkelagent
+Name[nl]=SSH-sleutelagent
+Name[nn]=Nøkkelagent for SSH
+Name[oc]=Agent de claus SSH
+Name[or]=SSH କି ସଦସ୍ୟ
+Name[pa]=SSH ਕੁੰਜੀ ਏਜੰਟ
+Name[pl]=Agent kluczy SSH
+Name[pt]=Agente de chaves SSH
+Name[pt_BR]=Agente de chaves SSH
+Name[ro]=Agent pentru chei SSH
+Name[ru]=Агент ключей SSH
+Name[sk]=Agent kľúčov SSH
+Name[sl]=Agent ključev SSH
+Name[sr]=Агент за ССХ кључеве
+Name[sr@latin]=Agent za SSH ključeve
+Name[sv]=SSH-nyckelagent
+Name[ta]=SSH முகவர்
+Name[te]=SSH కీ వాహకము
+Name[th]=เอเจนต์กุญแจ SSH
+Name[tr]=SSH Anahtar Aracı
+Name[ug]=SSH  ئاچقۇچ ياردەمچىسى
+Name[uk]=Агент ключів SSH
+Name[vi]=Đại diện khóa SSH
+Name[zh_CN]=SSH 密钥代理
+Name[zh_HK]=SSH 密碼匙代理程式
+Name[zh_TW]=SSH 金鑰代理程式
+Name=SSH Key Agent
+Comment[af]=GNOME-sleutelring: SSH-agent
+Comment[ar]=حلقة مفاتيح جنوم: عميل SSH
+Comment[as]=GNOME Keyring: SSH সহায়ক
+Comment[ast]=Depósitu de claves de GNOME: axente SSH
+Comment[be]=Вязкі ключоў GNOME: SSH-агент
+Comment[bg]=Ключодържател на GNOME: агент на SSH
+Comment[bn]=GNOME কী রিং: SSH এজেন্ট
+Comment[bn_IN]=GNOME Keyring: SSH এজেন্ট
+Comment[bs]=Gnomovi privjesci: SSH agent
+Comment[ca]=Anell de claus del GNOME: agent SSH
+Comment[ca@valencia]=Anell de claus del GNOME: agent SSH
+Comment[cs]=Klíčenka GNOME: Agent SSH
+Comment[da]=GNOME-nøgleringsdæmon: SSH-agent
+Comment[de]=GNOME-Schlüsselbunddienst: SSH-Agent
+Comment[el]=Κλειδοθήκη GNOME: Πράκτορας SSH
+Comment[en_GB]=GNOME Keyring: SSH Agent
+Comment[eo]=GNOME Ŝlosilaro: SSH-agento
+Comment[es]=Depósito de claves de GNOME: agente SSH
+Comment[et]=GNOME võtmerõngas: SSH-agent
+Comment[eu]=GNOMEren gako-sorta: SSH agentea
+Comment[fa]=دسته‌کلید گنوم: عامل SSH
+Comment[fi]=Gnomen avainnippu: SSH-agentti
+Comment[fr]=Trousseau de clés de GNOME : agent SSH
+Comment[fur]=Puarteclâfs di GNOME: agjent SSH
+Comment[gd]=Dul-iuchrach: Àidseant SSH
+Comment[gl]=GNOME Keyring: Axente SSH
+Comment[gu]=GNOME કીરીંગ: SSH ઍજન્ટ
+Comment[he]=קבוצת מפתחות של GNOME: סוכן SSH
+Comment[hi]=गनोम कीरिंग: SSH प्रतिनिधि
+Comment[hr]=GNOME skup ključeva: SSH agent
+Comment[hu]=GNOME kulcstartó – SSH-ügynök
+Comment[id]=Ring Kunci GNOME: Agen SSH
+Comment[it]=Portachiavi di GNOME: agente SSH
+Comment[ja]=GNOME キーリング: SSH エージェント
+Comment[kk]=GNOME Keyring: SSH агенті
+Comment[km]=GNOME Keyring ៖ ភ្នាក់ងារ SSH
+Comment[kn]=GNOME ಕೀಲಿಗೊಂಚಲು: SSH ಮಧ್ಯವರ್ತಿ
+Comment[ko]=그놈 키 모음: SSH 에이전트
+Comment[lt]=GNOME raktinė: SSH tarnyba
+Comment[lv]=GNOME atslēgu saišķis — SSH aģents
+Comment[mjw]=GNOME Keyring: SSH Agent
+Comment[mk]=Приврзок на GNOME: SSH агент
+Comment[ml]=ഗ്നോം കീറിങ്: എസ്എസ്എച് ഏജന്റ്
+Comment[mr]=GNOME किरिंग: SSH एजंट
+Comment[ms]=Gelang Kunci GNOME: Ejen SSH
+Comment[nb]=GNOME nøkkelring: SSH-agent
+Comment[ne]=जिनोम किरिङ : SSH एजेन्ट
+Comment[nl]=Sleutelbos-service: SSH-agent
+Comment[nn]=GNOME Nøkkelring: SSH-agent
+Comment[oc]=Trossèl de claus GNOME : agent SSH
+Comment[or]=GNOME କି ରିଙ୍ଗ: SSH ସଦସ୍ୟ
+Comment[pa]=ਗਨੋਮ ਕੀਰਿੰਗ: SSH ਏਜੰਟ
+Comment[pl]=Baza kluczy dla środowiska GNOME: agent SSH
+Comment[pt]=GNOME Keyring: agente SSH
+Comment[pt_BR]=Chaveiro do GNOME: Agente SSH
+Comment[ro]=Inelul de chei GNOME: Agent SSH
+Comment[ru]=Связка ключей GNOME: SSH-агент
+Comment[sk]=SSH agent zväzku kľúčov GNOME
+Comment[sl]=Zbirka ključev GNOME: agent SSH
+Comment[sr]=Гномови привесци: ССХ агент
+Comment[sr@latin]=Gnomovi privesci: SSH agent
+Comment[sv]=GNOME-nyckelring: SSH-agent
+Comment[ta]=GNOME கீரிங்: SSH முகவர்
+Comment[te]=GNOME కీరింగ్: SSH వాహకం
+Comment[th]=พวงกุญแจของ GNOME: เอเจนต์ SSH
+Comment[tr]=GNOME Anahtarlığı: SSH Aracı
+Comment[ug]=گىنوم ئاچقۇچ ھالقىسى：SSH  ياردەمچىسى
+Comment[uk]=Служба в'язки ключів GNOME: агент SSH
+Comment[vi]=Chùm chìa khóa GNOME: Đại diện SSH
+Comment[zh_CN]=GNOME 密钥环：SSH 代理
+Comment[zh_HK]=GNOME 密碼匙圈：SSH 代理程式
+Comment[zh_TW]=GNOME 鑰匙圈：SSH 代理程式
+Comment=GNOME Keyring: SSH Agent
+Exec=/usr/bin/gnome-keyring-daemon --start --components=ssh
+OnlyShowIn=GNOME;Unity;MATE;Cinnamon;
+X-GNOME-Autostart-Phase=PreDisplayServer
+X-GNOME-AutoRestart=false
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-keyring
+X-GNOME-Bugzilla-Component=general
+X-GNOME-Bugzilla-Version=40.0
+Hidden=true
diff --git a/.xinitrc b/.xinitrc
index bb04a66..ae17953 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -51,6 +51,8 @@ fi
 # Source some variables
 source /home/me/.bash_profile
 
+eval $(gnome-keyring-daemon --start)
+
 xcompmgr -c &
 setxkbmap fr &
 exec i3