Theme updates to include some new/changed plugin callbacks (oops)
flip flash() to top