Made preferences look a lot prettier
Removed useless resources
Merge remote-tracking branch 'origin/master'