[Themes] refactored codes