Theme Customizer Options added

and other clean up.