Fixed problems caused by theme
Merge branch 'master' of github.com:sjolsen/emacs