few theme fixes