Add theme
Fix conflict