Feature/basic theme2