More hacks for our mood highlighting
Some stuff not committed previously