first pass at improved 2015 theme compatibility

see this Gist for more detailed overview of these changes →
https://gist.github.com/momnt/e049d7a8649b9b3e19a2