Tentative fix for #160.
Working on theme.