Cleaned up and moved text and font stuff to general.