Fixed some markup errors, changed colors