diff --git a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptLogMessages.vue b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptLogMessages.vue
index 244a2d620b..216bee6046 100644
--- a/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptLogMessages.vue
+++ b/openc3-cosmos-init/plugins/packages/openc3-cosmos-tool-scriptrunner/src/tools/ScriptRunner/ScriptLogMessages.vue
@@ -135,9 +135,15 @@ export default {
   },
   methods: {
     messageClass(message) {
-      if (message.match(/CHECK:.*success with value.*after waiting/)) {
+      if (
+        message.match(/(CHECK|WAIT): .*(success|was within range.*) with value/)
+      ) {
         return 'openc3-green'
-      } else if (message.match(/CHECK:.*failed with value.*after waiting/)) {
+      } else if (
+        message.match(
+          /(CHECK|WAIT): .*(failed|failed to be within range.*) with value/,
+        )
+      ) {
         return 'openc3-red'
       } else {
         return ''