Small theme fixes