(Bug 5118) Fix conflicting colors in Angel Cake themes
(Bug 5118) Fix color conflict in Strata theme
Merge pull request #485 from momijizukamori/Bug5118/AngelCake

(Bug 5118) Fix conflicting colors in Angel Cake themes