Fix some issues with the simple theme.