Improve custom theme functionality - updating sub themes.