Merge "Revert "Fix issue with white and black themes""