Improved compatibility for default and darcula color schemes.
Fixed broken unit tests.