Merge the files from QiangZhai, most files are fro Settings panel