Theme Options Fixes