Setup init functions
Merged and fixed conflicts, add highlighter module