diff --git a/.bash_profile b/.bash_profile
index 8a84add..d939220 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -2,7 +2,7 @@
 # ~/.bash_profile
 #
 
-[[ -f ~/.bashrc ]] && . ~/.bashrc
+XDG_SESSION_TYPE=wayland
+EDITOR=vim
 
-# opam configuration
-test -r $HOME/.opam/opam-init/init.sh && . $HOME/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+[[ -f ~/.bashrc ]] && . ~/.bashrc
diff --git a/.bashrc b/.bashrc
index 8a56bbc..285dbd7 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,7 +14,7 @@ source ~/.aliases
 source ~/.bashcolors
 source ~/.functions
 
-export PS1="${Yellow}\d \A ${Off}${Cyan}\u@\h: ${Off}\w ${Green}\$(parse_branch git)${BPurple}\$(parse_branch fossil)${Off}\n-$ "
+export PS1="${Red}\d \A ${Off}${Yellow}\u@\h: ${Off}\w ${Purple}\$(parse_branch git)${BPurple}\$(parse_branch fossil)${Off}\n-$ "
 
 export PYTHONDONTWRITEBYTECODE=1
 export PYTHONUSERBASE=~/.env/python
@@ -38,4 +38,14 @@ gpg-connect-agent updatestartuptty /bye >/dev/null
 # Rust src path used for library tagging
 export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/library
 
-eval "$(stack --bash-completion-script stack)"
+# eval "$(stack --bash-completion-script stack)"
+
+case ${TERM} in
+  xterm*|rxvt*|Eterm|aterm|kterm|gnome*|alacritty)
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+
+    ;;
+  screen*)
+    PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
+    ;;
+esac