Boxing and other minor changes
Make log colors conditional