Finally got around to cleaning up the base theme options. Still has a ways to go for prime time.