broken-theme fixes