diff --git a/tcshrc.prompt.defs b/tcshrc.prompt.defs
index a78d96d..584acdf 100644
--- a/tcshrc.prompt.defs
+++ b/tcshrc.prompt.defs
@@ -189,11 +189,10 @@ set path_prompt="%c02"
 set end_prompt="%#"
 
 # The battery level thresholds are fixed, no need to recompute each prompt.
-set critical_battery_level = 10
-set low_battery_level      = 20
-set weak_battery_level     = 33
-set medium_battery_level   = 50
-set strong_battery_level   = 75
+
+
+set battery_levels=(                 75       50        33        20     10 )
+set battery_colors=( ${bright_green} ${green} ${csi}93m ${csi}33m ${red} ${red}${blink} ___ )
 
 
 alias oldp 'set prompt="$prompt_simple"; set cshenv_user_prompt_override'
diff --git a/tcshrc.prompt.final b/tcshrc.prompt.final
index 314a836..e3bb32c 100644
--- a/tcshrc.prompt.final
+++ b/tcshrc.prompt.final
@@ -150,19 +150,16 @@ if( $?cshenv_show_battery_level ) then
     else if( $?cshenv_battery_device ) then
         set battery_level=`cat ${cshenv_battery_device}`
     endif
-    if( ${battery_level} < ${critical_battery_level} ) then
-        set battery_color=${red}${blink}
-    else if( ${battery_level} < ${low_battery_level} ) then
-        set battery_color=${red}
-    else if( ${battery_level} < ${weak_battery_level} ) then
-        set battery_color=${csi}33m
-    else if( ${battery_level} < ${medium_battery_level} ) then
-        set battery_color=${csi}93m
-    else if( ${battery_level} < ${strong_battery_level} ) then
-        set battery_color=${green}
-    else
-        set battery_color=${bright_green}
-    endif
+
+
+	set battery_colors_tmp=(${battery_colors})
+	set battery_levels_tmp=(${battery_levels})
+	while( $#battery_levels_tmp )
+		if( ${battery_level} >= ${battery_levels_tmp[1]} ) break
+		shift battery_colors_tmp
+		shift battery_levels_tmp
+	end
+	set battery_color=${battery_colors_tmp[1]}
 
     if( ${battery_level} < 10 ) then
         set battery_level="  ${battery_level}"
@@ -170,7 +167,6 @@ if( $?cshenv_show_battery_level ) then
         set battery_level=" ${battery_level}"
     endif
 
-    #set battery_prompt="%{${battery_color}%}%{${battery_level}${at_color}\%%}%{${dim}%} "
     set battery_prefix="%{${csi}m${csi}28D%}"
     set battery_prompt="%{${csi}38;2;128;128;255;3mBattery Level:${sgr_reset} ${battery_color}${battery_level}%}${percent_color_seq}%{%${sgr_reset}         %}"
 else