More work on the theme and index page disabling