Attempting another theme fix