Rebuild files
Fix toggle variables, adjustments to theme