Merge "Clean up unused theme files (1/2)" into main