[#1398] Apply new theme colors
[#1398] Additional new theme colors