renaming theme for easier upstream merging