More work on theme dialog