feat: Implement advanced self-upgrade and fix indentation from 128809f

Author: 1minds3t