diff --git a/.bashrc b/.bashrc
index 3f666bb..0804f68 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,7 +5,12 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-PS1='\[\033[0;37m\][\u@\h $(date +%H:%M) \W]$\[\033[0;0m\] '
+CYAN="\[$(tput setaf 4)\]"
+RESET="\[$(tput sgr0)\]"
+
+# Set prompts
+PS1="${CYAN}[\u@\h ${RESET}\D{%H:%M}${CYAN} \W]${RESET}\$ "
+PS2="> "
 [ -z "$PS1" ] && return
 
 if [[ -n "$DISPLAY" ]] ; then
@@ -16,7 +21,7 @@ export EDITOR="vim"
 export GREP_COLOR="1;33"
 export GOPATH="$HOME/projects/go"
 export HISTCONTROL="ignoredups"
-export PATH="$PATH:~/bin:~/.gem/ruby/2.3.0/bin"
+export PATH="$PATH:$HOME/bin:"
 export WORKON_HOME="~/.virtualenvs"
 
 # less colors
@@ -65,3 +70,6 @@ BASE16_SHELL="$HOME/.config/base16-shell/scripts/base16-default-dark.sh"
 
 # AWS
 [[ -f $HOME/.aws ]] && source "$HOME/.aws"
+
+shopt -s autocd
+shopt -s checkwinsize