Unicorns!

Just... pull this. It's beautiful

Edits only done on the main view.

It's just.. so pretty.. :crying_cat_face: 

Oh, and it has all the other shit from the other pull request.. forgot about that. Sorry..