Fixed some strange issues with the color theme changes that were done previously