Fix TokenStore bug
Add source coloring pref pages.
Minor changes.
Minor cleanup.