new themes & view refactor