initial theme support and some bug fixes