Reshuffles + colour tweaks