Format fixes
Remove unused theme
Automatically reload some files