General code cleanup on all theme files