Merge branch 'cleanup' into release/1.2.2
Make Guide Mode hover widget draw with theme colors.
Make guide strokes draw with stroke colors and add comments.
Merge branch 'theme/guide-mode' into dev