v1.2

Replaced theme_options variable with xsbf_theme_options; Added two new
options to that variable; bumped version
Merge branch 'test'