New Theme Style and Refactoring Class