added theme map creation & added theme event handlers