Minor fixes for trade notifications & themes