Redesign color scheme, minor format improvements