Rename G -> W (waiting), style bright, and fix addm