corrected setup for osx
new theme
fixing conflict