Hopefully the last fix for the 'custom' theme