More default theme fixes