Adding new options and fix latest tracker comment

http://themes.trac.wordpress.org/ticket/13640#comment:6