Local updates.
Merge with upstream.
Color theme corrested.