Feature/basic theme fixes