Updates

Added some UI colors and tweaked the formulas a bit more.