Merge fade and color bug hotfixes into master