Refactor
Use default theme issue branch