Type and color scheme rehaul