Remove themes core precedence
Fix merge resolution