Make layer selector optional, rename themes to topics