Various theme fixes