diff --git a/themes/brethil.zsh-theme b/themes/brethil.zsh-theme
index a4de108..c0557e4 100644
--- a/themes/brethil.zsh-theme
+++ b/themes/brethil.zsh-theme
@@ -6,14 +6,32 @@
 # See the prompt expansion section in `info zsh` for more info
 
 function user_prompt(){
-  # root printed on a red background
-  local USER_PROMPT="%(#.%K{160}%F{255}[root]%k%f.)"
-  echo "$USER_PROMPT"
-  # if [[ -n $SSH_CONNECTION ]]; then
-  #     local host="${purple}%B%m%b${default}"
-  #     host="%U${host}%u"
-  #     echo "$host"
-  # fi
+	# prints info about username/hostname
+	# for ssh connections
+	local p
+	local host
+	if [[ $UID -eq 0 ]]; then
+			# root
+			echo -n "%F{255}[%f" # open square bracket
+			echo -n "%K{160}%F{255}%Broot%b%k%f"
+			if [[ $SSH_CONNECTION ]]; then
+				# add the white @
+				# echo -n '%F{255} at %f'
+				echo -n "%F{255}@%f"
+			fi
+	fi
+	if [[ $SSH_CONNECTION ]]; then
+		if [[ $UID -ne 0 ]]; then
+			echo -n "%F{255}[%f" # open square bracket
+		fi
+		# underlined orange hostname (%m)
+		echo -n "%K{202}%B%F{255}%m%f%k%b"
+		if [[ $UID -ne 0 ]]; then
+			echo -n "%F{255}]%f" # close square bracket
+		fi
+	fi
+	# close square bracket
+	if [[ $UID -eq 0 ]]; then echo "%F{255}]%f"; fi
 }
 
 function job_prompt() {