Adding FIXME support and colors