Updated for latest hakyll and addded new software