More work on adapting the themes.