Finished theme colors support for TwoP6