improoved theme builder with new options