Add more folder aliases
Update minor configurations