Added some TODO marks.
Almost fixed remembering  old style bug. (The issue is because the delay between highlighting/styling).