Fine-tune "Run CSP Fixer" message
Shuffle/rename template sources once more