Don't try to save files when you don't have the permissions to do so
Add theme
Merge remote-tracking branch 'origin/master' into dev
Clean code