Changes for Child Theme Friendliness