Remove old color-theme code
Attempt to sort of fringe problems in new frames