diff --git a/themes/easy/easy.theme.bash b/themes/easy/easy.theme.bash
index 7e2e3389ef..3cb171d771 100644
--- a/themes/easy/easy.theme.bash
+++ b/themes/easy/easy.theme.bash
@@ -1,21 +1,22 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2034 # Expected behavior for themes.
-# shellcheck disable=SC2154 #TODO: fix these all.
 
-SCM_THEME_PROMPT_PREFIX="${bold_green}[ ${normal}"
-SCM_THEME_PROMPT_SUFFIX="${bold_green} ] "
-SCM_THEME_PROMPT_DIRTY=" ${red}✗"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
+SCM_THEME_PROMPT_PREFIX="${bold_green?}[ ${normal?}"
+SCM_THEME_PROMPT_SUFFIX="${bold_green?} ] "
+SCM_THEME_PROMPT_DIRTY=" ${red?}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓"
 
-prompt_command() {
-	if [ "$(whoami)" = root ]; then
-		cursor_color="${bold_red}"
-		user_color="${green}"
+function prompt_command() {
+	local scm_prompt_info
+	if [ "${USER:-${LOGNAME?}}" = root ]; then
+		cursor_color="${bold_red?}"
+		user_color="${green?}"
 	else
-		cursor_color="${bold_green}"
-		user_color="${white}"
+		cursor_color="${bold_green?}"
+		user_color="${white?}"
 	fi
-	PS1="${user_color}\u${normal}@${white}\h ${bold_black}\w\n${reset_color}$(scm_prompt_info)${cursor_color}❯ ${normal}"
+	scm_prompt_info="$(scm_prompt_info)"
+	PS1="${user_color}\u${normal?}@${white?}\h ${bold_black?}\w\n${reset_color?}${scm_prompt_info}${cursor_color}❯ ${normal?}"
 }
 
 safe_append_prompt_command prompt_command