Clean up 5 additional theme files and expand linting coverage

• Fix color variable references using ${var?} pattern for robust error handling
• Resolve SC2181 exit code checking and SC2236 style issues in modern-time theme
• Remove problematic shebang lines from theme files per bash-it standards
• Add themes/modern-time, themes/morris, themes/n0qorg, themes/newin, themes/nwinkler to clean_files.txt
• All themes pass shellcheck, shfmt, and bash-it requirements

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: seefood

clean_files.txt

@@ -81,7 +81,12 @@ themes/metal
 themes/minimal
 themes/modern
 themes/modern-t
+themes/modern-time
+themes/morris
+themes/n0qorg
+themes/newin
 themes/norbu
+themes/nwinkler
 themes/oh-my-posh
 themes/p4helpers.theme.bash
 themes/pete

themes/modern-time/modern-time.theme.bash

@@ -1,14 +1,16 @@
+# shellcheck shell=bash
+# shellcheck disable=SC2034
 # Modified version of the original modern theme in bash-it
 # Removes the battery charge and adds the current time
 
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
-SCM_GIT_CHAR="${bold_green}±${normal}"
-SCM_SVN_CHAR="${bold_cyan}⑆${normal}"
-SCM_HG_CHAR="${bold_red}☿${normal}"
+SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
+SCM_GIT_CHAR="${bold_green?}±${normal?}"
+SCM_SVN_CHAR="${bold_cyan?}⑆${normal?}"
+SCM_HG_CHAR="${bold_red?}☿${normal?}"
 
 case $TERM in
 	xterm*)
@@ -22,8 +24,8 @@ esac
 PS3=">> "
 
 is_vim_shell() {
-	if [ ! -z "$VIMRUNTIME" ]; then
-		echo "[${cyan}vim shell${normal}]"
+	if [ -n "$VIMRUNTIME" ]; then
+		echo "[${cyan?}vim shell${normal?}]"
 	fi
 }
 
@@ -33,14 +35,15 @@ modern_current_time_prompt() {
 
 prompt() {
 	SCM_PROMPT_FORMAT='[%s][%s]'
-	if [ $? -ne 0 ]; then
+	local last_status=$?
+	if [ $last_status -ne 0 ]; then
 		# Yes, the indenting on these is weird, but it has to be like
 		# this otherwise it won't display properly.
 
-		PS1="${TITLEBAR}${bold_red}┌─${reset_color}$(scm_prompt)$(modern_current_time_prompt)[${cyan}\W${normal}]$(is_vim_shell)
-${bold_red}└─▪${normal} "
+		PS1="${TITLEBAR}${bold_red?}┌─${reset_color?}$(scm_prompt)$(modern_current_time_prompt)[${cyan?}\W${normal?}]$(is_vim_shell)
+${bold_red?}└─▪${normal?} "
 	else
-		PS1="${TITLEBAR}┌─$(scm_prompt)$(modern_current_time_prompt)[${cyan}\W${normal}]$(is_vim_shell)
+		PS1="${TITLEBAR}┌─$(scm_prompt)$(modern_current_time_prompt)[${cyan?}\W${normal?}]$(is_vim_shell)
 └─▪ "
 	fi
 }

themes/morris/morris.theme.bash

@@ -1,3 +1,5 @@
+# shellcheck shell=bash
+# shellcheck disable=SC2034
 # prompt theming
 
 # added TITLEBAR for updating the tab and window titles with the pwd
@@ -18,9 +20,9 @@ function prompt_command() {
 }
 
 # scm theming
-SCM_THEME_PROMPT_DIRTY=" ${red}✗"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓"
-SCM_THEME_PROMPT_PREFIX="${green}("
-SCM_THEME_PROMPT_SUFFIX="${green})${reset_color}"
+SCM_THEME_PROMPT_DIRTY=" ${red?}✗"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓"
+SCM_THEME_PROMPT_PREFIX="${green?}("
+SCM_THEME_PROMPT_SUFFIX="${green?})${reset_color?}"
 
 safe_append_prompt_command prompt_command

themes/n0qorg/n0qorg.theme.bash

@@ -1,22 +1,23 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# shellcheck disable=SC2034
 # n0qorg theme by Florian Baumann <[email protected]>
 
 ## look-a-like
 # host directory (branch*)»
 # for example:
 # ananas ~/Code/bash-it/themes (master*)»
 function prompt_command() {
-	PS1="${bold_blue}[$(hostname)]${normal} \w${normal} ${bold_white}[$(git_prompt_info)]${normal}» "
+	PS1="${bold_blue?}[$(hostname)]${normal?} \w${normal?} ${bold_white?}[$(git_prompt_info)]${normal?}» "
 }
 
 safe_append_prompt_command prompt_command
 
 ## git-theme
 # feel free to change git chars.
-GIT_THEME_PROMPT_DIRTY="${bold_blue}*${bold_white}"
+GIT_THEME_PROMPT_DIRTY="${bold_blue?}*${bold_white?}"
 GIT_THEME_PROMPT_CLEAN=""
-GIT_THEME_PROMPT_PREFIX="${bold_blue}(${bold_white}"
-GIT_THEME_PROMPT_SUFFIX="${bold_blue})"
+GIT_THEME_PROMPT_PREFIX="${bold_blue?}(${bold_white?}"
+GIT_THEME_PROMPT_SUFFIX="${bold_blue?})"
 
 ## alternate chars
 #

themes/newin/newin.theme.bash

@@ -1,13 +1,14 @@
-#!/usr/bin/env bash
+# shellcheck shell=bash
+# shellcheck disable=SC2034
 
-SCM_THEME_PROMPT_DIRTY=" ${red}✗"
-SCM_THEME_PROMPT_CLEAN=" ${green}✓"
-SCM_THEME_PROMPT_PREFIX=" ${purple}|${green} "
-SCM_THEME_PROMPT_SUFFIX="${purple} |"
+SCM_THEME_PROMPT_DIRTY=" ${red?}✗"
+SCM_THEME_PROMPT_CLEAN=" ${green?}✓"
+SCM_THEME_PROMPT_PREFIX=" ${purple?}|${green?} "
+SCM_THEME_PROMPT_SUFFIX="${purple?} |"
 
 prompt() {
 	exit_code=$?
-	PS1="$(if [[ ${exit_code} = 0 ]]; then echo "${green}${exit_code}"; else echo "${red}${exit_code}"; fi) ${yellow}\t ${cyan}\w$(scm_prompt_info)${reset_color}\n${orange}$ ${reset_color}"
+	PS1="$(if [[ ${exit_code} = 0 ]]; then echo "${green?}${exit_code}"; else echo "${red?}${exit_code}"; fi) ${yellow?}\t ${cyan?}\w$(scm_prompt_info)${reset_color?}\n${orange?}$ ${reset_color?}"
 }
 
 safe_append_prompt_command prompt

themes/nwinkler/nwinkler.theme.bash

@@ -1,4 +1,5 @@
 # shellcheck shell=bash
+# shellcheck disable=SC2034
 
 # Two line prompt showing the following information:
 # (time) SCM [username@hostname] pwd (SCM branch SCM status)
@@ -15,8 +16,8 @@
 # The exit code functionality currently doesn't work if you are using the 'fasd' plugin,
 # since 'fasd' is messing with the $PROMPT_COMMAND
 
-PROMPT_END_CLEAN="${green}→${reset_color}"
-PROMPT_END_DIRTY="${red}→${reset_color}"
+PROMPT_END_CLEAN="${green?}→${reset_color?}"
+PROMPT_END_DIRTY="${red?}→${reset_color?}"
 
 function prompt_end() {
 	echo -e "$PROMPT_END"
@@ -31,15 +32,15 @@ prompt_setter() {
 	fi
 	# Save history
 	_save-and-reload-history 1
-	PS1="($(clock_prompt)) $(scm_char) [${blue}\u${reset_color}@${green}\H${reset_color}] ${yellow}\w${reset_color}$(scm_prompt_info) ${reset_color}\n$(prompt_end) "
+	PS1="($(clock_prompt)) $(scm_char) [${blue?}\u${reset_color?}@${green?}\H${reset_color?}] ${yellow?}\w${reset_color?}$(scm_prompt_info) ${reset_color?}\n$(prompt_end) "
 	PS2='> '
 	PS4='+ '
 }
 
 safe_append_prompt_command prompt_setter
 
-SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
+SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
 SCM_THEME_PROMPT_PREFIX=" ("
 SCM_THEME_PROMPT_SUFFIX=")"
 RVM_THEME_PROMPT_PREFIX=" ("