refactor + theme work