add filter to turn off theme options & fix empty labels