basic textual replace refactoring
moving key press handler to further through down default key handling code
Merge branch 'dev' into refactoring
annotation kind added, mark occurrences deactivatable.