theme: inital refactor