Added support for the base theme and fixed a menu bug