Reformat files
Compatibility changes for new admin theme