Cleanup and moved colours into theme resource dictionary