diff --git a/bash_logout b/bash_logout
new file mode 100644
index 0000000..9bccd62
--- /dev/null
+++ b/bash_logout
@@ -0,0 +1,2 @@
+clear
+reset
diff --git a/bashrc b/bashrc
index 76afbf5..8f0e71c 100644
--- a/bashrc
+++ b/bashrc
@@ -40,8 +40,6 @@ export ANDROID_HOME=/opt/android-sdk
 
 
 # Tweaks
-set -o vi
-
 [[ $- != *i* ]] && return
 
 if [ -f /etc/bash_completion ]; then . /etc/bash_completion; fi
@@ -104,6 +102,7 @@ fi
 alias fuck='eval $(thefuck $(fc -ln -1))'
 alias FUCK='fuck'
 
+# Command not found
 [ -r /etc/profile.d/cnf.sh ] && . /etc/profile.d/cnf.sh
 
 # Functions
diff --git a/inputrc b/inputrc
new file mode 100644
index 0000000..e302a8d
--- /dev/null
+++ b/inputrc
@@ -0,0 +1,13 @@
+$include /etc/inputrc
+set editing-mode vi
+$if mode=vi
+set keymap vi-command
+# these are for vi-command mode
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+set keymap vi-insert
+# these are for vi-insert mode
+"\e[A": history-search-backward
+"\e[B": history-search-forward
+$endif
+