@@ -318,28 +318,10 @@
 	      (iup:attribute-set! lbl "TITLE" munged-val)))
 	(iup:attribute-set! lbl "FGCOLOR" (if (hash-table-ref/default *collapsed* newval #f) "0 112 112" "0 0 0"))
 	(if (< i maxn)
 	    (loop (+ i 1)))))))
 
-(define (get-color-for-state-status state status)
-  (case (string->symbol state)
-    ((COMPLETED)
-     (if (equal? status "PASS")
-	 "70 249 73"
-	 (if (or (equal? status "WARN")
-		 (equal? status "WAIVED"))
-	     "255 172 13"
-	     "223 33 49"))) ;; greenish orangeish redish
-    ((LAUNCHED)         "101 123 142")
-    ((CHECK)            "255 100 50")
-    ((REMOTEHOSTSTART)  "50 130 195")
-    ((RUNNING)          "9 131 232")
-    ((KILLREQ)          "39 82 206")
-    ((KILLED)           "234 101 17")
-    ((NOT_STARTED)      "240 240 240")
-    (else               "192 192 192")))
-
 (define (update-buttons uidat numruns numtests)
   (if *please-update-buttons*
       (let* ((runs        (if (> (length *allruns*) numruns)
 			      (take-right *allruns* numruns)
 			      (pad-list *allruns* numruns)))
@@ -414,11 +396,11 @@
 			       (teststate  (db:test-get-state    test))
 			       (teststart  (db:test-get-event_time test))
 			       (runtime    (db:test-get-run_duration test))
 			       (buttontxt  (if (equal? teststate "COMPLETED") teststatus teststate))
 			       (button     (vector-ref columndat rown))
-			       (color      (get-color-for-state-status teststate teststatus))
+			       (color      (common:get-color-for-state-status teststate teststatus))
 			       (curr-color (vector-ref buttondat 1)) ;; (iup:attribute button "BGCOLOR"))
 			       (curr-title (vector-ref buttondat 2))) ;; (iup:attribute button "TITLE")))
 			  (if (not (equal? curr-color color))
 			      (iup:attribute-set! button "BGCOLOR" color))
 			  (if (not (equal? curr-title buttontxt))
@@ -502,11 +484,11 @@
 		     (iup:toggle status  #:action   (lambda (obj val)
 						      (mark-for-update)
 						      (if (eq? val 1)
 							  (hash-table-set! *status-ignore-hash* status #t)
 							  (hash-table-delete! *status-ignore-hash* status)))))
-	      '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a")))
+	      '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP")))
 	     (apply 
 	      iup:hbox
 	      (map (lambda (state)
 		     (iup:toggle state   #:action   (lambda (obj val)
 						      (mark-for-update)