Moved settings and added color scheme
Merge branch 'master' of github.com:davoclavo/.hogar