Fixes in sexpr representation for diffing

Some color fields are ommitted in sexpr representation for diffing which causes changes to be detected but be invisible in diff.

This fixes what I could find and also some typing fixes.