Changed some helper function names and updated cmodel theme