Fixed several bugs.  Started implementing new theming support.