add highlighter
rename empty with default
remove macros