(Bug 5118) Fix conflicting colors in Angel Cake themes