Broken theme fixes