Bunch of fixes
added mokon style
Changed diff cond