diff --git a/web/server.go b/web/server.go
index cb831b2..617ac01 100644
--- a/web/server.go
+++ b/web/server.go
@@ -455,7 +455,7 @@ func (s *Server) broadcastRaceEvent(event derby.Event) {
 
 	case derby.EventRaceComplete:
 		s.logger.Info("Broadcasting race complete event")
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-info'>Race Complete</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-warning'>Race Complete</div>\n\n")
 		s.db.SaveHeatResult(heatResult)
 	}
 }
@@ -719,6 +719,8 @@ func (s *Server) handleReset() http.HandlerFunc {
 			return
 		}
 
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-warning'>Ready</div>\n\n")
+
 		w.Header().Set("Content-Type", "application/json")
 		w.Write([]byte(`{"status": "reset"}`))
 	}
@@ -1689,7 +1691,7 @@ func (s *Server) handleNextHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-info'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1736,7 +1738,7 @@ func (s *Server) handlePreviousHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-info'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1777,7 +1779,7 @@ func (s *Server) handleRerunHeat() http.HandlerFunc {
 			Event: *heatData,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-info'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
@@ -1819,7 +1821,7 @@ func (s *Server) handleSetRacingGroup() http.HandlerFunc {
 			Event: heatResults,
 		})
 
-		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-info'>Idle</div>\n\n")
+		s.sendRaceEventToAllClients("event: race-status\ndata: <div id='status-indicator' class='w-25 h-50 badge bg-primary'>Idle</div>\n\n")
 
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]string{"status": "success"})
diff --git a/web/templates/race_manage.templ b/web/templates/race_manage.templ
index 06b64ba..4bace68 100644
--- a/web/templates/race_manage.templ
+++ b/web/templates/race_manage.templ
@@ -43,7 +43,7 @@ templ RaceManage(heatData *models.HeatData, nextHeat *models.HeatData, groups []
                             <div class="mb-3">
                                 <h5>Timer Control</h5>
                                 <div class="d-flex align-items-center mb-2" hx-ext="sse" sse-connect="/api/events" sse-swap="race-status">
-                                    <div id="status-indicator" class="w-25 h-50 badge bg-secondary">Ready</div>
+                                    <div id="status-indicator" class="w-25 h-50 badge bg-primary">Idle</div>
                                 </div>
                                 <div class="btn-group" role="group">
                                     <button class="btn btn-warning" hx-post="/api/reset" hx-swap="none">
diff --git a/web/templates/race_manage_templ.go b/web/templates/race_manage_templ.go
index b5ba150..35150da 100644
--- a/web/templates/race_manage_templ.go
+++ b/web/templates/race_manage_templ.go
@@ -140,7 +140,7 @@ func RaceManage(heatData *models.HeatData, nextHeat *models.HeatData, groups []m
 					return templ_7745c5c3_Err
 				}
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, ">Next Heat <i class=\"bi bi-arrow-right\"></i></button></div></div><div class=\"mb-3\"><h5>Timer Control</h5><div class=\"d-flex align-items-center mb-2\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 badge bg-secondary\">Ready</div></div><div class=\"btn-group\" role=\"group\"><button class=\"btn btn-warning\" hx-post=\"/api/reset\" hx-swap=\"none\"><i class=\"bi bi-arrow-repeat\"></i> Reset Timer</button> <button class=\"btn btn-danger\" hx-post=\"/api/force-end\" hx-swap=\"none\"><i class=\"bi bi-flag-fill\"></i> Force End</button> <button class=\"btn btn-info\" hx-post=\"/api/race/rerun-heat\" hx-swap=\"none\"><i class=\"bi bi-arrow-counterclockwise\"></i> Re-Run Heat</button></div></div><div id=\"gate-status\" class=\"alert alert-secondary\"><strong>Gate Status:</strong> <span id=\"gate-status-text\">Unknown</span></div></div></div></div><div class=\"col-md-6\" hx-ext=\"sse\" sse-connect=\"/api/admin/events\" sse-swap=\"results\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 13, ">Next Heat <i class=\"bi bi-arrow-right\"></i></button></div></div><div class=\"mb-3\"><h5>Timer Control</h5><div class=\"d-flex align-items-center mb-2\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 badge bg-primary\">Idle</div></div><div class=\"btn-group\" role=\"group\"><button class=\"btn btn-warning\" hx-post=\"/api/reset\" hx-swap=\"none\"><i class=\"bi bi-arrow-repeat\"></i> Reset Timer</button> <button class=\"btn btn-danger\" hx-post=\"/api/force-end\" hx-swap=\"none\"><i class=\"bi bi-flag-fill\"></i> Force End</button> <button class=\"btn btn-info\" hx-post=\"/api/race/rerun-heat\" hx-swap=\"none\"><i class=\"bi bi-arrow-counterclockwise\"></i> Re-Run Heat</button></div></div><div id=\"gate-status\" class=\"alert alert-secondary\"><strong>Gate Status:</strong> <span id=\"gate-status-text\">Unknown</span></div></div></div></div><div class=\"col-md-6\" hx-ext=\"sse\" sse-connect=\"/api/admin/events\" sse-swap=\"results\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
diff --git a/web/templates/race_public.templ b/web/templates/race_public.templ
index 803545a..a1458e3 100644
--- a/web/templates/race_public.templ
+++ b/web/templates/race_public.templ
@@ -21,7 +21,7 @@ templ RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHea
                                 <div class="row">
                                     <div class="col-12">
                                         <div class="timer-display text-center mb-4" hx-ext="sse" sse-connect="/api/events" sse-swap="race-status">
-                                            <div id="status-indicator" class="w-25 h-50 badge bg-secondary">Ready</div>
+                                            <div id="status-indicator" class="w-25 h-50 badge bg-primary">Idle</div>
                                         </div>
                                         
                                         <div class="lanes-container">
diff --git a/web/templates/race_public_templ.go b/web/templates/race_public_templ.go
index e5ac41e..55b3c02 100644
--- a/web/templates/race_public_templ.go
+++ b/web/templates/race_public_templ.go
@@ -87,7 +87,7 @@ func RacePublic(heatData *models.HeatData, nextHeat *models.HeatData, onDeckHeat
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</h2></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-4\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display text-center mb-4\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 badge bg-secondary\">Ready</div></div><div class=\"lanes-container\">")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 4, "</h2></div><div class=\"card-body\"><div id=\"current-heat\" class=\"mb-4\"><div class=\"row\"><div class=\"col-12\"><div class=\"timer-display text-center mb-4\" hx-ext=\"sse\" sse-connect=\"/api/events\" sse-swap=\"race-status\"><div id=\"status-indicator\" class=\"w-25 h-50 badge bg-primary\">Idle</div></div><div class=\"lanes-container\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}