Use the right base controller
Update the lock file
Update to the latest version of octicons
Whitespace update