file refactoring plus resume work
revert
Revert "revert"

This reverts commit 977bf69df3dab93a0d251b5fe03e37b8c41849dd.
scroll work, coloring, gutters