Added a couple of gradients

Also, refactored a few common values into less variables