Added yari and scala mode
Fixed Scala mode alist