Theme user profile
Fixing conflict