Updated to new Tumblr; refactored