Changed theme select statement to only select visible and active themes