more type cleaning; bug fixes and work on ThemeDriver interface