theme fixes