Minor fixes that clang warns about

Clang complains about different things to gcc; MacOS defaults to
clang.
Trim strings in waitForOk

Trim some diagnostic strings to prevent stray \r's in the log
Tweak the icon colors

Make the 'on' color a bit more pronounced and move it into definitions.h