bug on theme selector and default thme