updated tables and colors