Added support for base themes, cleanup all habitat variables, cleanup all extra functions