More Colr and Font changes, pulling parts together and simplifying