update gui settings
Merge branch 'master' of https://github.com/carlfrg/my-emacs.d
update org and theme settings