Feature/basic theme fixes rebase