Added Phoenix theme
Resolved conflict