Make sure the initial theme is taken into account when setting the initi...

...al base layer

Fix #833