Update theme
Remove comments of private methods in util.file2