Feature/cc theme