Other theme fixes