Revert "color fixes"

This reverts commit 571e7e9731315637d7e3b4f8adf94c6a998fa668.
Revert "Themeing fixes"

This reverts commit 7a5f889001243170a7c73bb7e5ed1bd81efc0016.
didnt work