(core) code cleanups
(theme) testing template- and css overrides