Change theme and colorscheme name to avoid conflicts