added orgmode and themes
merge conflict fix