diff --git a/fish/theme-t31m/t31m_prompt.fish b/fish/theme-t31m/t31m_prompt.fish
index 9b99c68..d7ffd25 100644
--- a/fish/theme-t31m/t31m_prompt.fish
+++ b/fish/theme-t31m/t31m_prompt.fish
@@ -2,10 +2,10 @@ function prompt::awsenv
     if test -n "$env"
         if [ $env = "prod" ]
             printf '%s ' \U2601
-            echo -n -s (yellow)"["(red)"$env"(yellow)"]"(off)
+            echo -n -s (yellow)"["(red)(string upper $env)(yellow)"]"(off)
         else
             printf '%s ' \U2601
-            echo -n -s (yellow)"["(off)"$env"(yellow)"]"(off)
+            echo -n -s (yellow)"["(off)(string upper $env)(yellow)"]"(off)
         end
     end
 end
@@ -27,11 +27,10 @@ function t31m_prompt
     echo -n -s "$pyenv"
     echo -n -s "$awsenv"
 
-    # get time since last command finished
 	if test $CMD_DURATION
         # Show duration of the last command in seconds
-        set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.3fs", $1 / $2}')
+        set duration (echo "$CMD_DURATION 1000" | awk '{printf "%.2fs", $1 / $2}')
         printf '%s ' \U23F1
-        echo -n -s (red)$duration(off)
+        echo -n -s (yellow)"["(off)$duration(yellow)"]"(off)
     end
 end