diff --git a/shell/bashrc.d/04-prompt.sh b/shell/bashrc.d/04-prompt.sh
index e018ca4..2feee39 100644
--- a/shell/bashrc.d/04-prompt.sh
+++ b/shell/bashrc.d/04-prompt.sh
@@ -3,6 +3,7 @@ GREEN=$(tput setaf 2)
 YELLOW=$(tput setaf 3)
 BLUE=$(tput setaf 4)
 MAGENTA=$(tput setaf 5)
+GRAY=$(tput setaf 8)
 ITALIC=$(tput sitm)
 RESET=$(tput sgr0)
 
@@ -62,7 +63,7 @@ set_prompt() {
   else
     git_symbol=
   fi
-  PS1="\n$last_command_stats\[$BLUE\]\w\[$RESET\]$git_symbol\[$YELLOW\]$git_branch\[$RESET\]\n\[$prompt_color\]❯\[$RESET\] "
+  PS1="\n$last_command_stats\[$GRAY\]$(whoami)@$(hostname)\[$RESET\] \[$BLUE\]\w\[$RESET\]$git_symbol\[$YELLOW\]$git_branch\[$RESET\]\n\[$prompt_color\]❯\[$RESET\] "
 }
 
 trap 'last_command_timer' DEBUG
diff --git a/shell/bashrc.d/99-load-tmux.sh b/shell/bashrc.d/99-load-tmux.sh
index 0f62b39..769956b 100644
--- a/shell/bashrc.d/99-load-tmux.sh
+++ b/shell/bashrc.d/99-load-tmux.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ -z "$DISPLAY" ] && [ -x "$(command -v startx)" ]; then
+if [ -z "$DISPLAY" ] && [ -x "$(command -v startx)" ] && ! pgrep herbstluftwm >/dev/null; then
   # start x if it's available and we're not already in it
   startx
 else
diff --git a/xorg/Xresources b/xorg/Xresources
index 72e95d0..8d7ecfd 100644
--- a/xorg/Xresources
+++ b/xorg/Xresources
@@ -1,4 +1,4 @@
-Xcursor.theme: whiteglass
+Xcursor.theme: Adwaita
 
 *.foreground:  #dedacf
 *.background:  #080808