Adding minor fixes and theme support