Fixes after the new theme