Remove demo customizations
Couple more colour tweaks.