Apply reverted changes
Merging anythink-theme-hotfix--overdrive-error