The Aesthetically Pleasing Update (v0.25)

MERGE THESE BRANCHES.