bug fixes, theme changes