Update theme #1
Fix conflict