Feature/cc theme fixes