Added caller info to base theme