+ theme refactoring
+ bug fixing on user preference service