update resources
Merge branch 'Imnudar-update-resources'