Add resources
Fix
Fix
Fix
Fix windows