almost finished with the Scala syntax and theme reworking