initial theme fixes