Add conque-shell plugin and misc adjustment