fixes for default theme bugs