Feature/new theme