Rearrange the order of variables in a couple of seldom-used Theme function.

Fixes #285