zth theme refactoring