Reformat files
Compatibility changes for new admin theme
Merge pull request #1 from Roope/master

New admin theme compatibility changes