Add: update theme, remove useless files
Merge: deal conflict