updating with master
tryna get up to date, splash gradient still broken
merged