Merge todo lists
Refactored syntax highlighter and partially removed deprecated API usage
Remove test from Impl class and prepare for JUnit