Square theme fix