Cleanout pjax and tweak the support around theming